summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-03-12Remove collation parameter from db_set_charset() (no longer needed)Andrey Andreev4-8/+8
2012-03-12merged latest develop branch.Mike Funk160-269/+335
2012-03-12Changed space to tab in docblock.Mike Funk1-1/+1
2012-03-12merged with latest develop.Mike Funk3-1/+20
2012-03-12Postgre to PostgresAndrey Andreev1-1/+1
2012-03-12Path helper improvementTaufan Aditya3-15/+13
2012-03-12Merge pull request #1079 from mikedfunk/feature/form_val_configAndrey Andreev3-1/+20
2012-03-12Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into featur...Mike Funk160-268/+315
2012-03-12Fix escape_str() and change _prep_query() to just return the queryAndrey Andreev1-4/+3
2012-03-12Add missing semicolonsAndrey Andreev2-2/+2
2012-03-12Remove usage of SET NAMES and the deprecated mysql_escape_string() from MySQL...Andrey Andreev2-30/+4
2012-03-12updated docs & changelogRoger Herbert3-6/+11
2012-03-12Fixed typo in English language file for upload library.Seb Pollard1-1/+1
2012-03-12Merge pull request #1173 from nihaopaul/developAndrey Andreev2-0/+23
2012-03-12defaults for the functionnihaopaul1-3/+3
2012-03-12test if isset(['name']) is actually set instead of assuming it to benihaopaul1-1/+1
2012-03-12code readability improvementsnihaopaul1-1/+5
2012-03-12form_dropdown() will now also take an array for unity with other form helpers...nihaopaul1-3/+3
2012-03-12form_dropdown() will now also take an array for unity with other form helpers...nihaopaul1-1/+1
2012-03-12form_dropdown() will now also take an array for unity with other form helpers...nihaopaul1-1/+2
2012-03-12form_dropdown() will now also take an array for unity with other form helpers.nihaopaul2-0/+18
2012-03-12Fix conflicts (or at least trying to do so)Andrey Andreev0-0/+0
2012-03-12Fix _limit()Andrey Andreev1-1/+1
2012-03-12Merge upstream branchAndrey Andreev158-215/+238
2012-03-12Add unit tests for path helperHamza Bhatti1-0/+29
2012-03-12Merge changes from upstream and fix _limit()Andrey Andreev159-215/+238
2012-03-11Fix erroneus regex from previous commitAndrey Andreev1-1/+1
2012-03-11Added an Android <= 2.1 specific check to force_download()Andrey Andreev2-7/+20
2012-03-11AND -> &&Roger Herbert1-5/+5
2012-03-11refactored to start from latest version, also less diff painRoger Herbert1-15/+20
2012-03-11Revert "Make timespan() helper show fuzzier periods if required"Roger Herbert1-86/+45
2012-03-11Make timespan() helper show fuzzier periods if requiredRoger Herbert1-45/+86
2012-03-11Merge pull request #1164 from tiyowan/directory-helper-unit-testsPhil Sturgeon1-0/+42
2012-03-11Add unit tests for directory helperHamza Bhatti1-0/+42
2012-03-11Merge pull request #1161 from toopay/unit-testsPhil Sturgeon8-28/+119
2012-03-10Fix incomplete and skipped testTaufan Aditya8-28/+119
2012-03-10Merge pull request #1155 from chrisguiney/developPhil Sturgeon1-1/+10
2012-03-10Fixing some spacing.Christopher Guiney1-2/+2
2012-03-10Really fix camelize()Andrey Andreev1-1/+1
2012-03-10Remove PHP 5.1.6-specific codeAndrey Andreev3-34/+3
2012-03-10Fix camelize()Andrey Andreev1-8/+5
2012-03-10Fixed camelize.Phil Sturgeon3-7/+7
2012-03-10Merge pull request #1159 from dododedodonl/patch-2Phil Sturgeon1-1/+1
2012-03-10Removed quotes from the Content-Type header to support mime-type detection on...dododedodonl1-1/+1
2012-03-10Merge pull request #1156 from tiyowan/feature/unit-testsPhil Sturgeon3-12/+12
2012-03-10Merge pull request #1157 from toopay/travisPhil Sturgeon1-0/+11
2012-03-10Travis setupTaufan Aditya1-0/+11
2012-03-10Fix test errors in Loader_test.php and URI_test.phpHamza Bhatti3-12/+12
2012-03-10Allow drivers to be loaded as an array, like models and libraries.Christopher Guiney1-1/+10
2012-03-10Merge pull request #1153 from tiyowan/feature/unit-testsPhil Sturgeon1-23/+41