summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-03-12Merge branch 'develop' into feature/db_toString_supportJoel Kallman185-7771/+7531
2012-03-12ExtraTaufan Aditya1-2/+2
2012-03-12Fix some spaces and alignments in the new Wincache driverAndrey Andreev3-44/+39
2012-03-12Merge pull request #1174 from tiyowan/remove-definesAndrey Andreev2-5/+5
2012-03-12Merge pull request #1095 from colonelchlorine/developPhil Sturgeon3-1/+169
2012-03-12Revert "Remove unused defines from CI_Utf8"tiyowan1-1/+10
2012-03-12Revert "Re-add UTF8_ENABLED constant"tiyowan1-3/+1
2012-03-12Revert "Re-add MB_ENABLED constant"tiyowan1-5/+0
2012-03-12Replace function_exists() checks with MB_ENABLED constanttiyowan2-5/+5
2012-03-12Re-add MB_ENABLED constanttiyowan1-0/+5
2012-03-12Re-add UTF8_ENABLED constantHamza Bhatti1-1/+3
2012-03-12Remove unused defines from CI_Utf8Hamza Bhatti1-10/+1
2012-03-12typoMichiel Vugteveen1-2/+2
2012-03-12user guide udateMichiel Vugteveen1-113/+152
2012-03-12Merge upstream branchAndrey Andreev1-2/+2
2012-03-12DocTaufan Aditya1-2/+2
2012-03-12Update the list of supported databasesAndrey Andreev1-2/+2
2012-03-12Minimal PHP version annotationTaufan Aditya1-1/+1
2012-03-12Postgres to PostgreSQLAndrey Andreev2-8/+8
2012-03-12Left the function_exists due some security restriction in some hosting enviro...Taufan Aditya1-2/+9
2012-03-12Merge upstream branchAndrey Andreev9-43/+72
2012-03-12Just some cleanup in the Table classAndrey Andreev1-7/+3
2012-03-12Merge pull request #1078 from mikedfunk/feature/table_configAndrey Andreev3-1/+18
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