summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-06-22Merge pull request #1517 from WanWizard/developPhil Sturgeon1-10/+4
fixed query grouping when using where($array) syntax
2012-06-22fixed query grouping when using where($array) syntaxWanWizard1-10/+4
on request of Phil
2012-06-21Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon4-7/+5
2012-06-21Replaced block tag minification regex with a less greedy solution.Phil Sturgeon1-1/+1
2012-06-21Fix issue #79Andrey Andreev2-2/+2
2012-06-20Fix issue #1510Andrey Andreev1-4/+2
2012-06-20Small adjustment due to 079fbfcde095230f304e889217f897031a948f61Andrey Andreev1-1/+1
2012-06-19Fixed Migrations and an incorrect strict comparison.Phil Sturgeon2-2/+2
2012-06-19Merge pull request #1507 from Dumk0/patch-2Andrey Andreev1-17/+17
Property values aligned into one vertical line
2012-06-19Property values aligned into one vertical lineDumk01-17/+17
2012-06-19Merge pull request #1505 from robbyrice/developAndrey Andreev1-1/+1
fixing a typo in the comments of the migration config file
2012-06-19fixing a typo in the comments of the migration config fileRobert Doucette1-1/+1
2012-06-18Changed limit() and offset() to ignore NULL valuesAndrey Andreev2-7/+5
2012-06-18Fix ODBC _limit()Andrey Andreev1-1/+1
2012-06-18Fix issue #1328Andrey Andreev2-1/+7
2012-06-17Add join() USING supportAndrey Andreev2-3/+12
2012-06-17Improve escaping, support for table names with spaces and fix where() for ↵Andrey Andreev3-34/+30
strings with no spaces around operators
2012-06-17Add deprecated docblock tags for do_hash() and read_file()Andrey Andreev2-0/+2
2012-06-17AND -> &&Andrey Andreev1-1/+1
2012-06-17Pagination: fixed 'rel' attribute handling, added custom attributes support, ↵Andrey Andreev3-50/+81
deprecated 'anchor_class' setting
2012-06-17Merge pull request #1479 from srtfisher/developPhil Sturgeon1-1/+1
A TTL of 0 will keep the cache persistant.
2012-06-16Add an option to disable MIME detection in the Upload library (issue #1494)Andrey Andreev2-3/+16
2012-06-16anchor_popup() improvementsAndrey Andreev3-13/+34
2012-06-16Fix two anchor_popup() issuesAndrey Andreev2-5/+3
2012-06-16Merge pull request #1495 from vkeranov/developEric Barnes1-1/+1
Really important space fix in Zip.php
2012-06-16Really important space fix :)vkeranov1-1/+1
2012-06-16Fix CI_Calendar::generate() not accepting NULLs (introduced in ↵Andrey Andreev1-2/+2
d261b1e89c3d4d5191036d5a5660ef6764e593a0)
2012-06-16Fix issue #999Andrey Andreev3-5/+20
2012-06-16Fix local_to_gmt()Andrey Andreev2-10/+10
2012-06-16Fix issue #938 + some related improvementsAndrey Andreev3-17/+13
2012-06-16Small improvements to form_open()Andrey Andreev1-4/+6
2012-06-16Merge pull request #1492 from vlakoff/developAndrey Andreev2-12/+12
Documentation: remaining PHP "var" declarations changed to "public"
2012-06-16Documentation: remaining PHP "var" declarations changed to "public"vlakoff2-12/+12
Since PHP 4 isn't supported anymore, let's clean up these few PHP "var" declarations which were remaining in the documentation. According to my checks, there is no more PHP "var" left.
2012-06-16Spelling fixes - `wether` to `whether`Alex Bilbie4-5/+5
Interestingly `wether` means a castrated ram in old English
2012-06-16All Query Builder methods to respect _protect_identifiers by defaultAndrey Andreev1-18/+24
2012-06-16Added an escape parameter to where_in(), or_where_in(), where_not_in(), ↵Andrey Andreev3-18/+16
or_where_not_in() and made where(), or_where() to default the escape setting to the value of _protect_identifiers
2012-06-16Changed order_by() default escaping to _protect_identifiersAndrey Andreev1-2/+3
2012-06-16Fix issue #318 + added a default to the switch() in CI_Output::minify()Andrey Andreev3-39/+50
2012-06-15Fix issue #167Andrey Andreev2-1/+2
2012-06-15mimes.php: zip, rar, php from pull #1472Andrey Andreev2-3/+7
2012-06-15Merge pull request #1490 from vlakoff/developAndrey Andreev1-1/+1
Fix error in Encryption Class documentation
2012-06-15Fix error in Encryption Class documentation vlakoff1-1/+1
One ANSI character is 8 bits, so 32 characters are not 128 bits but 256 bits.
2012-06-15Merge pull request #1487 from IT-Can/query-error-sql-logPhil Sturgeon1-1/+1
[Database] Extra debug info when there is a Query error.
2012-06-15Add support for HTTP code 303 in set_status_header(), as suggested in pull #341Andrey Andreev2-7/+14
2012-06-15more loggingMichiel Vugteveen1-1/+1
2012-06-15Fix nice_date() documentationAndrey Andreev1-5/+7
2012-06-15Fix issue #520Andrey Andreev2-0/+5
2012-06-15Optimize encode_php_tags()Andrey Andreev2-2/+2
2012-06-15Update simple_query() documentation (issue #1484)Andrey Andreev1-5/+25
2012-06-15Merge pull request #1480 from IT-Can/fix-validation-exactlengthAndrey Andreev1-6/+18
Validation exact_length not working