summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
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
Minor assignment fix.
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
Update system/libraries/Javascript.php
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
Can not use $array[] for reading.
2012-04-28Important spelling fix to CodeIgniter.php fileChris Berthe1-1/+1
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 ↵Timothy Warren2-11/+16
library-cleanup
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
Cookie $index should start with a prefix.
2012-04-27Merge upstream branchAndrey Andreev50-1055/+948
2012-04-27Merge upstream branchAndrey Andreev123-7246/+6007
2012-04-27Update system/core/Input.php ziv1-0/+1
Fix a cookie get back problem. Cookie $index should start with a prefix.
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 ↵Timothy Warren36-614/+505
library-cleanup
2012-04-26Merge pull request #981 from narfbg/develop-db-postgrePhil Sturgeon2-81/+56
Improve the PostgreSQL database driver
2012-04-26Merge pull request #979 from narfbg/develop-db-cubridPhil Sturgeon4-166/+70
Improve the CUBRID database driver
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
Fix Issue #627
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
Renamed Active Record class to Query Builder
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
Conflicts: system/core/Loader.php system/database/DB_query_builder.php system/database/drivers/cubrid/cubrid_driver.php system/database/drivers/mssql/mssql_driver.php system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysqli/mysqli_driver.php system/database/drivers/oci8/oci8_driver.php system/database/drivers/odbc/odbc_driver.php system/database/drivers/pdo/pdo_driver.php system/database/drivers/postgre/postgre_driver.php system/database/drivers/sqlite/sqlite_driver.php user_guide_src/source/changelog.rst user_guide_src/source/database/query_builder.rst
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren1-1/+1
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
2012-04-23Merge upstreamTimothy Warren1-3/+1
2012-04-23Merge pull request #1271 from dixy/develop-microtimeAndrey Andreev2-11/+8
Use parameter 'get_as_float' of microtime()
2012-04-23Fix issue #1265Andrey Andreev1-8/+8
2012-04-23Merge pull request #1272 from king724/developPhil Sturgeon1-0/+1
Adding in .ics MIME type for calendar invites.
2012-04-21Use parameter 'get_as_float' of microtime()dixy2-11/+8
2012-04-20Start comment cleanup of librariesTimothy Warren14-90/+440
2012-04-19Fix syntax errorTimothy Warren1-1/+1
2012-04-19Additional formatting fixesTimothy Warren13-204/+243
2012-04-19Normalize comments in core filesTimothy Warren11-184/+217