summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Expand)AuthorFilesLines
2012-05-02Merge pull request #876 from narfbg/develop-helpers-sstAndrey Andreev3-196/+156
2012-05-02Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-odbcAndrey Andreev38-827/+1859
2012-05-02Merge pull request #1304 from petsagouris/minor-assignment-fixAndrey Andreev1-1/+1
2012-05-02Fix pagination anchor_class with multiple initializationsAndrey Andreev1-6/+5
2012-05-02Merge pull request #1285 from Kosmin/patch-1Andrey Andreev1-1/+1
2012-05-02Update system/libraries/Javascript.phpCosmin Atanasiu1-8/+1
2012-05-01Update system/libraries/Javascript.phpCosmin Atanasiu1-8/+8
2012-05-01Update system/libraries/Javascript.phpCosmin Atanasiu1-1/+8
2012-04-30Reverted recent commit, cookie_prefix was breaking things.Phil Sturgeon1-1/+0
2012-04-28Minor assignment fix.George Petsagourakis1-1/+1
2012-04-28Important spelling fix to CodeIgniter.php fileChris Berthe1-1/+1
2012-04-27Fix rest of the helpersTimothy Warren11-527/+509
2012-04-27Fix docblocks A-HTimothy Warren10-671/+680
2012-04-27Fix calendar and session librariesTimothy Warren3-24/+199
2012-04-27Fixed Cart, Migration, Parser and Zip librariesTimothy Warren4-6/+137
2012-04-27Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into library-...Timothy Warren2-11/+16
2012-04-27Fix Cache, Image_lib and Log librariesTimothy Warren3-2/+142
2012-04-27Merge pull request #1298 from zivyuan/patch-1Phil Sturgeon1-0/+1
2012-04-27Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-mssqlAndrey Andreev50-1055/+951
2012-04-27Merge upstream branchAndrey Andreev50-1055/+948
2012-04-27Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqlsrvAndrey Andreev50-1056/+952
2012-04-27Merge upstream branchAndrey Andreev73-2734/+1346
2012-04-27Merge upstream branchAndrey Andreev123-7246/+6007
2012-04-27Update system/core/Input.php ziv1-0/+1
2012-04-27Fix Config.php and partially fix Image_lib.phpTimothy Warren2-25/+205
2012-04-27Fix Table library docblocksTimothy Warren1-2/+50
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into library-...Timothy Warren36-614/+505
2012-04-26Merge pull request #981 from narfbg/develop-db-postgrePhil Sturgeon2-81/+56
2012-04-26Merge pull request #979 from narfbg/develop-db-cubridPhil Sturgeon4-166/+70
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren18-291/+305
2012-04-26Merge pull request #1262 from Korri/developPhil Sturgeon1-2/+2
2012-04-26Fixed conflicts.Phil Sturgeon61-3242/+930
2012-04-26Fixed issue #122 - ruri_string() in subdirs.Phil Sturgeon2-3/+6
2012-04-26Merge pull request #1061 from jamierumbelow/developPhil Sturgeon16-286/+297
2012-04-26PDO patch and run the testTaufan Aditya1-1/+1
2012-04-26A couple more documentation updatesJamie Rumbelow2-2/+2
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow136-7246/+6020
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren1-1/+1
2012-04-25Added missing commas.Anton Lindqvist1-2/+2
2012-04-25Align and sort valid cache drivers.Anton Lindqvist1-7/+7
2012-04-25Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developAnton Lindqvist137-9172/+8931
2012-04-24Updating XSS cleaning to better handle base64 encoded attributes.Wes Baker1-6/+8
2012-04-24Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren1-1/+1
2012-04-24Update system/helpers/file_helper.phpst21-1/+1
2012-04-24Update system/database/drivers/sqlsrv/sqlsrv_driver.phpst21-1/+1
2012-04-24Update system/libraries/Javascript.phpCosmin Atanasiu1-1/+1
2012-04-23Use tabs to separate class propertiesTimothy Warren14-55/+54
2012-04-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren5-18/+19
2012-04-23Tweak to comments to conform to style guide.Sam Li1-1/+1
2012-04-23Added fix for issue: https://github.com/EllisLab/CodeIgniter/issues/1277Sam Li1-0/+3