summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Expand)AuthorFilesLines
2012-05-17Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon56-1116/+1154
2012-05-17Fixed conflicts from merging in 2.1.1.Phil Sturgeon1-1/+1
2012-05-17Added upgrade for 2.1.1 and updated version.Phil Sturgeon13-13/+13
2012-05-17Remove set_time_limit() call. CodeIgniter should respect php.ini setting.Pawel Decowski1-11/+0
2012-05-17merge upstreamTimothy Warren54-1103/+1053
2012-05-17Suggested changesTimothy Warren2-2/+2
2012-05-17Update inflector docblocks, add changelog entryTimothy Warren1-5/+5
2012-05-17Merge upstreamTimothy Warren46-601/+657
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 Andreev1-1/+1
2012-05-17Check cookie against md5 regex.Alexander Hofstede1-1/+1
2012-05-16If we want E_STRICT, don't suppress it!Alan Jenkins1-10/+0
2012-05-16Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into errorsTimothy Warren2-13/+101
2012-05-15Minor changes on the pull #1355 additionsAndrey Andreev1-4/+4
2012-05-15Merge pull request #1355 from shidec/developAndrey Andreev1-0/+93
2012-05-15Escaping boolean data type for postgreSoesapto Joeni Hantoro1-10/+2
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 Sturgeon1-12/+7
2012-05-14Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren7-50/+60
2012-05-14Move errors to views folderTimothy Warren1-2/+2
2012-05-13Improve the solution for issue #1342Andrey Andreev1-1/+1
2012-05-11Fix issue #1349Andrey Andreev1-1/+1
2012-05-11User_agent library improvementsAndrey Andreev1-12/+12
2012-05-11Escaping boolean data type, some DBMS (e.g., postgre) need itSoesapto Joeni Hantoro1-1/+1
2012-05-11simpler script, add boolean handling on DB_driver/escapeSoesapto Joeni Hantoro1-14/+4
2012-05-11Generate better conditions statement on boolean field type. Actually boolean ...Soesapto Joeni Hantoro1-1/+15
2012-05-09Fix issue #1342Andrey Andreev1-1/+1
2012-05-07Added a return false if an image doesn't pass XSS cleaning to prevent file_ge...Wes Baker1-0/+4
2012-05-07Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developWes Baker74-1975/+2934
2012-05-05Merge pull request #1325 from st2/developAndrey Andreev1-1/+1
2012-05-05Added a return false if an image doesn't pass XSS cleaning to prevent file_ge...Wes Baker1-1/+5
2012-05-04Update system/database/drivers/interbase/interbase_utility.phpCusco1-1/+1
2012-05-04Merge remote-tracking branch 'upstream/develop' into db-testsTaufan Aditya1-21/+24
2012-05-04PDO SQLite bug fixed, for result_objectTaufan Aditya1-12/+7
2012-05-04unset userdataMichiel Vugteveen1-21/+24
2012-05-03Update system/libraries/Cart.php - To enable integrity when using associati...ThallisPHP1-1/+1
2012-05-02Merge pull request #1312 from petsagouris/fix-xmlrpc-typosAndrey Andreev1-3/+3
2012-05-02Merge pull request #1313 from petsagouris/fix-form-validation-typoAndrey Andreev1-1/+1
2012-05-02Fixing some typos in the xmlrpc class.George Petsagourakis1-3/+3
2012-05-02Fixing some typos.George Petsagourakis1-1/+1
2012-05-02Merge upstreamTimothy Warren10-219/+174
2012-05-02Reverted rui_string change.Phil Sturgeon2-6/+3
2012-05-02Some line separation for better readabilityAndrey Andreev1-0/+5
2012-05-02Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqliteAndrey Andreev41-1023/+2015
2012-05-02Fix a wrong variable nameAndrey Andreev1-1/+1