summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-01-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren3-79/+44
2012-01-25Merge pull request #974 from CroNiX/patch-3Phil Sturgeon1-3/+6
2012-01-25Added bit about having mod_rewrite enabled for removing index.php CroNiX1-3/+6
2012-01-25Merge pull request #973 from CroNiX/patch-2Phil Sturgeon1-1/+1
2012-01-25Change hardcoded "application" directory to use the APPPATH constant as it wo...CroNiX1-1/+1
2012-01-25Merge pull request #842 from narfbg/develop-encryptPhil Sturgeon1-75/+37
2012-01-25Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-16/+10
2012-01-25Merge pull request #957 from cryode/bug/force_downloadPhil Sturgeon1-16/+10
2012-01-24Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren158-2604/+1945
2012-01-24Revert "Cleaned up a few things in PDO driver"Timothy Warren1-39/+32
2012-01-24Cleaned up a few things in PDO driverTimothy Warren1-32/+39
2012-01-24Revert a space in the license agreement :)Andrey Andreev1-1/+1
2012-01-24Fix bug #195Eric Roberts1-16/+10
2012-01-19Some more cleaningAndrey Andreev1-4/+2
2012-01-17Merge pull request #931 from talkingwithsean/patch-1Phil Sturgeon1-0/+1
2012-01-16APC throws "apc_store() expects parameter 3 to be long, string given". Valida...Sean Fisher1-0/+1
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 #908 from insign/patch-1Phil Sturgeon1-1/+1
2012-01-10Merge pull request #906 from narfbg/develop-issue-904Phil Sturgeon3-10/+8
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-10Merge pull request #911 from narfbg/develop-fix-langPhil Sturgeon1-1/+1
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 Beilsma155-2259/+1507
2012-01-10Fixed a bug in CI_Lang::load()Andrey Andreev1-1/+1
2012-01-09Some more stuff ...Andrey Andreev1-17/+6
2012-01-09Removed the first slash of the line 51. With this, the goal of the code don't...insign1-1/+1
2012-01-09Fix issue #904Andrey Andreev3-10/+8
2012-01-09Merge pull request #903 from purwandi/databasePhil Sturgeon1-3/+2
2012-01-09Merge pull request #901 from narfbg/develop-fix-outputPhil Sturgeon1-4/+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-08Merge pull request #897 from IT-Can/develop-fixes-896Phil Sturgeon3-5/+5
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 Andreev31-1434/+848
2012-01-08Merge pull request #850 from RS71/developPhil Sturgeon4-3/+16
2012-01-08Merge pull request #894 from narfbg/develop-dbPhil Sturgeon6-573/+270
2012-01-08Merge pull request #881 from narfbg/develop-core-codeigniterPhil Sturgeon2-60/+41
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
2012-01-08Switch private methods to protectedAndrey Andreev1-5/+5