summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-05-17Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon92-1184/+2362
2012-05-17Fixed conflicts from merging in 2.1.1.Phil Sturgeon1-1/+1
2012-05-17Merge branch 'release/2.1.1'Phil Sturgeon163-359/+560
2012-05-17Added upgrade for 2.1.1 and updated version.Phil Sturgeon155-299/+391
2012-05-17Remove set_time_limit() call. CodeIgniter should respect php.ini setting.Pawel Decowski1-11/+0
2012-05-17Added changelog entryTimothy Warren1-0/+1
2012-05-17merge upstreamTimothy Warren57-1106/+1057
2012-05-17Merge pull request #1300 from timw4mail/patchAndrey Andreev12-516/+499
2012-05-17Add parens to changelog entryTimothy Warren1-1/+1
2012-05-17Suggested changesTimothy Warren2-2/+2
2012-05-17Update inflector docblocks, add changelog entryTimothy Warren2-5/+6
2012-05-17Merge upstreamTimothy Warren82-669/+1864
2012-05-17Clean up the helpersAndrey Andreev6-43/+39
2012-05-17Clean up the librariesAndrey Andreev24-414/+383
2012-05-17Cleanup the core classesAndrey Andreev15-132/+135
2012-05-17Merge pull request #1366 from aphofstede/2.1-stableAndrey Andreev2-1/+2
2012-05-17Use tabs for indentingAlexander Hofstede1-1/+1
2012-05-17Revert "Use tab for indent"Alexander Hofstede3-16/+1
2012-05-17Use tab for indentAlexander Hofstede3-1/+16
2012-05-17Check cookie against md5 regex.Alexander Hofstede2-1/+2
2012-05-16Merge pull request #1364 from toopay/core-testsAndrey Andreev2-3/+3
2012-05-16If we want E_STRICT, don't suppress it!Alan Jenkins1-10/+0
2012-05-16Reduce decimal points, since there is a micro differencess on runtime and up...Taufan Aditya2-3/+3
2012-05-16Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into errorsTimothy Warren38-80/+1307
2012-05-16Add note in the upgrade guide to move errors folderTimothy Warren1-1/+6
2012-05-16Merge pull request #1360 from toopay/core-testsPhil Sturgeon15-15/+352
2012-05-16Merge pull request #1359 from sourcejedi/backtrace-filter-fixAndrey Andreev1-1/+4
2012-05-16fix backtrace filteringAlan Jenkins1-1/+4
2012-05-15Remove unused hardcoded reference from *phpunit.xml filesTaufan Aditya6-13/+1
2012-05-15Input class code-coverageTaufan Aditya6-14/+207
2012-05-15Comment block for explanationTaufan Aditya1-0/+3
2012-05-15Security Code coverageTaufan Aditya4-1/+110
2012-05-15Clean up autoloader annotationTaufan Aditya1-1/+0
2012-05-15Benchmark code-coverageTaufan Aditya2-0/+45
2012-05-15Minor changes on the pull #1355 additionsAndrey Andreev2-5/+5
2012-05-15Merge pull request #1355 from shidec/developAndrey Andreev2-0/+94
2012-05-15Escaping boolean data type for postgreSoesapto Joeni Hantoro1-10/+2
2012-05-15escaping boolean data type for postgre change logSoesapto Joeni Hantoro1-0/+1
2012-05-15Escaping boolean data type for postgreSoesapto Joeni Hantoro1-2/+2
2012-05-15Rollback changes, move it to postgre_driverSoesapto Joeni Hantoro1-4/+0
2012-05-15Rollback changes, move it to postgre_driverSoesapto Joeni Hantoro1-1/+1
2012-05-15Escaping boolean data type on postgreSoesapto Joeni Hantoro1-0/+101
2012-05-15Merge pull request #1324 from toopay/db-testsPhil Sturgeon26-63/+856
2012-05-14Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren13-132/+144
2012-05-14Move errors to views folderTimothy Warren6-2/+2
2012-05-14Load base config first, then environment's configThanasis Polychronakis1-9/+9
2012-05-13Improve the solution for issue #1342Andrey Andreev1-1/+1
2012-05-11Fix issue #1349Andrey Andreev2-3/+4
2012-05-11Remove a duplicate mobile user agent entryAndrey Andreev1-1/+0
2012-05-11User_agent library improvementsAndrey Andreev3-84/+89