summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-05-16fix backtrace filteringAlan Jenkins1-1/+4
The backtrace was filtered to remove CI system files, but the filter was buggy. It would also filter out application files which happened to contain the string "system"... or ALL files, if the application directory is under /system/ (Perhaps the latter comes as a surprise, but it's explicitly mentioned in index.php and <http://codeigniter.com/wiki/mod_rewrite>). Instead, we should test whether the file is underneath BASEPATH (using realpath() to make sure we have the same sort of slashes).
2012-04-28Merge pull request #1302 from chrisberthe/important_spelling_fixPhil Sturgeon1-1/+1
Important spelling fix to CodeIgniter.php
2012-04-28Important spelling fix to CodeIgniter.php fileChris Berthe1-1/+1
2012-04-27Merge pull request #1299 from timw4mail/patchPhil Sturgeon10-671/+680
Fix helper docblocks
2012-04-27Fix docblocks A-HTimothy Warren10-671/+680
2012-04-27Merge pull request #1296 from timw4mail/library-cleanupPhil Sturgeon24-147/+1171
Library cleanup - adding additional docblocks
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 Warren3-11/+17
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 pull request #993 from narfbg/develop-issue-128Andrey Andreev2-11/+16
Fix issue #128
2012-04-27Merge upstream branchAndrey Andreev228-7839/+8046
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 Warren82-786/+1404
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 pull request #1266 from timw4mail/patchPhil Sturgeon17-402/+482
Normalize comments in core files
2012-04-26Merge pull request #1004 from kwaanonline/developPhil Sturgeon1-60/+92
Date Helper documentation update
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren60-370/+1061
2012-04-26Merge pull request #1262 from Korri/developPhil Sturgeon1-2/+2
Fix Issue #627
2012-04-26Fixed conflicts.Phil Sturgeon107-3380/+1766
2012-04-26Fixed issue #122 - ruri_string() in subdirs.Phil Sturgeon3-3/+7
2012-04-26Merge pull request #1061 from jamierumbelow/developPhil Sturgeon31-331/+355
Renamed Active Record class to Query Builder
2012-04-26Merge pull request #1294 from toopay/pdo-patchPhil Sturgeon1-1/+1
Hotfix PDO
2012-04-26Remove temporary branch from travis whitelistTaufan Aditya1-2/+1
2012-04-26PDO patch and run the testTaufan Aditya2-2/+3
2012-04-26Merge pull request #1246 from toopay/db-testsPhil Sturgeon27-34/+697
Improved test coverage for Database.
2012-04-26A couple more documentation updatesJamie Rumbelow2-2/+2
2012-04-26Adding some update notes for 3.0.0 (renaming AR to QB)Jamie Rumbelow1-0/+10
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow231-7887/+10538
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 Warren4-32/+38
2012-04-26Merge pull request #1292 from ChadBH/developAndrey Andreev1-2/+2
Corrected path to jquery
2012-04-26Corrected path to jqueryChad Hedgcock1-2/+2
2012-04-25Merge pull request #1288 from petsagouris/Issue-131Andrey Andreev2-29/+35
Updated foreign_characters.php
2012-04-25Added foreign_characters.php changes in the changelog.George Petsagourakis1-0/+1
2012-04-25Merge pull request #1289 from st2/patch-2Andrey Andreev1-1/+1
Same Issue on #1238 at IIS System
2012-04-24Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren2-2/+2
2012-04-24Update system/helpers/file_helper.phpst21-1/+1
2012-04-24Add changelog entry for already fixed issue #23Andrey Andreev1-1/+1
2012-04-24Added Romanian characters to the foreign_chars.phpGeorge Petsagourakis1-4/+4
fixes #131
2012-04-24Added Greek characters to the foreign_chars.phpGeorge Petsagourakis1-28/+33
2012-04-24Merge pull request #1286 from st2/patch-1Phil Sturgeon1-1/+1
Fix Issue #1282 Update system/database/drivers/sqlsrv/sqlsrv_driver.php
2012-04-24Update system/database/drivers/sqlsrv/sqlsrv_driver.phpst21-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 Warren6-18/+20
2012-04-23Merge pull request #1278 from samxli/developPhil Sturgeon1-0/+3
Added fix for issue #1277
2012-04-23Tweak to comments to conform to style guide.Sam Li1-1/+1
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-06 09:31:28 +0100