summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Expand)AuthorFilesLines
2012-02-01Merge upstreamAndrey Andreev12-821/+448
2012-02-01Merge remote-tracking branch 'upstream/develop' into develop-image-libAndrey Andreev13-821/+449
2012-01-31HTTPS detection fixRoss Duggan1-1/+1
2012-01-27Switch _process_fields() from private to protectedAndrey Andreev1-1/+1
2012-01-27Add PHP version check in db_pconnect()Andrey Andreev1-0/+6
2012-01-27Improve the MySQLi database driverAndrey Andreev5-354/+189
2012-01-26Improve the MySQL database driverAndrey Andreev4-375/+205
2012-01-25Merge pull request #842 from narfbg/develop-encryptPhil Sturgeon1-75/+37
2012-01-24Revert a space in the license agreement :)Andrey Andreev1-1/+1
2012-01-24Revert a space in the license agreement :)Andrey Andreev1-1/+1
2012-01-24Revert a space in the license agreement :)Andrey Andreev1-1/+1
2012-01-24Fix bug #195Eric Roberts1-16/+10
2012-01-20Replace AND with &&Andrey Andreev1-4/+2
2012-01-20Revert if() merge, for readabilityAndrey Andreev1-5/+22
2012-01-19Some more cleaningAndrey Andreev1-146/+104
2012-01-19Some more cleaningAndrey Andreev1-4/+2
2012-01-19Still update the session on AJAX calls, just don't regenerate the session IDAndrey Andreev1-6/+30
2012-01-19Fix issue #154Andrey Andreev1-68/+50
2012-01-17Fixed error in inflector_helper.php in the singular function.Wilbur Suero1-1/+1
2012-01-16APC throws "apc_store() expects parameter 3 to be long, string given". Valida...Sean Fisher1-0/+1
2012-01-12Remove a quoteAndrey Andreev1-1/+1
2012-01-12CI_Image_lib::image_reproportion() to work if only one of either width or hei...Andrey Andreev1-107/+88
2012-01-12Merge pull request #846 from aquariuz/developPhil Sturgeon3-3/+3
2012-01-12array keys should be 0, 1, and 2. key 3 results in error (invalid offset)Ronald Beilsma1-1/+1
2012-01-10Two returnsAndrey Andreev1-3/+2
2012-01-10Merge pull request #906 from narfbg/develop-issue-904Phil Sturgeon2-8/+6
2012-01-10Merge pull request #892 from narfbg/develop-core-securityPhil Sturgeon1-173/+106
2012-01-10Merge pull request #912 from narfbg/develop-fix-fhPhil Sturgeon2-8/+8
2012-01-10Fix a bug in system/core/CodeIgniter.phpAndrey Andreev1-1/+1
2012-01-10Fix a bug in the File helperAndrey Andreev1-7/+7
2012-01-10closedir closes directory handle, not directory pathRonald Beilsma1-1/+1
2012-01-10closedir closes directory handle, not directory pathRonald Beilsma1-1/+1
2012-01-10Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developRonald Beilsma126-2179/+1368
2012-01-10Fixed a bug in CI_Lang::load()Andrey Andreev1-1/+1
2012-01-09Some more stuff ...Andrey Andreev1-17/+6
2012-01-09Fix issue #904Andrey Andreev2-8/+6
2012-01-09Merge pull request #903 from purwandi/databasePhil Sturgeon1-3/+2
2012-01-09Fix error undefined variable query on count_all_results db active recordPurwandi1-3/+2
2012-01-09Remove once again ...Andrey Andreev1-1/+0
2012-01-09Really fix this ...Andrey Andreev1-2/+3
2012-01-09Fix a possible notice in Output libraryAndrey Andreev1-4/+2
2012-01-08Fixes for issue 896Michiel Vugteveen3-5/+5
2012-01-08Some more misc. stuffAndrey Andreev1-10/+3
2012-01-08Remove some tabsAndrey Andreev1-1/+1
2012-01-08Merge remote-tracking branch 'upstream/develop' into develop-core-securityAndrey Andreev26-1395/+806
2012-01-08Merge pull request #850 from RS71/developPhil Sturgeon1-3/+8
2012-01-08Merge pull request #894 from narfbg/develop-dbPhil Sturgeon6-573/+270
2012-01-08Merge pull request #881 from narfbg/develop-core-codeigniterPhil Sturgeon1-26/+18
2012-01-08Merge pull request #886 from narfbg/develop-core-imPhil Sturgeon2-86/+46
2012-01-08Merge pull request #877 from narfbg/develop-helpers-tuxPhil Sturgeon3-88/+78