summaryrefslogtreecommitdiffstats
path: root/system/core
AgeCommit message (Expand)AuthorFilesLines
2012-03-07oopsMichiel Vugteveen1-1/+1
2012-03-07removed is_methodMichiel Vugteveen1-18/+6
2012-03-07added method() and is_method()Michiel Vugteveen1-0/+29
2012-03-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow2-20/+21
2012-03-06Changed rewrite_short_tags to have no effect on PHP 5.4Andrey Andreev1-1/+1
2012-03-04Merged develop and fixed conflicts.Phil Sturgeon16-989/+641
2012-02-29Add strtolower to the HTTPS checkAndrey Andreev1-1/+1
2012-02-28Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow1-18/+13
2012-02-28Merge upstream branchAndrey Andreev1-18/+13
2012-02-27Do not create a CSRF cookie if CSRF protection is not enabledAndrey Andreev1-19/+20
2012-02-27Just some style changes and removed a useless checkAndrey Andreev1-18/+13
2012-02-19Renaming Active Record to Query Builder across the systemJamie Rumbelow1-5/+5
2012-02-08Merge upstream branchAndrey Andreev2-37/+33
2012-02-08Remove a few spacesAndrey Andreev1-2/+2
2012-02-08Fix CI_Input::is_ajax_request()Andrey Andreev1-37/+29
2012-02-05Adding in a few 503 status codes for common errors in response to this Expres...Kevin Cupp2-0/+4
2012-02-01Merge upstreamAndrey Andreev1-1/+1
2012-01-31HTTPS detection fixRoss Duggan1-1/+1
2012-01-27Remove an unnecessary unset()Andrey Andreev1-1/+0
2012-01-27Fix issue #128Andrey Andreev1-11/+12
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 Sturgeon1-1/+1
2012-01-10Fix a bug in system/core/CodeIgniter.phpAndrey Andreev1-1/+1
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-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-08Remove some tabsAndrey Andreev1-1/+1
2012-01-08Merge remote-tracking branch 'upstream/develop' into develop-core-securityAndrey Andreev16-732/+456
2012-01-08Merge pull request #850 from RS71/developPhil Sturgeon1-3/+8
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-08Switch private methods to protectedAndrey Andreev1-5/+5
2012-01-08Replace AND with &&Andrey Andreev1-6/+6
2012-01-08Merge pull request #889 from narfbg/develop-outputPhil Sturgeon1-104/+44
2012-01-08Merge pull request #885 from narfbg/develop-core-cePhil Sturgeon2-59/+40
2012-01-08Style guide stuffAndrey Andreev1-4/+2
2012-01-08Merge pull request #883 from narfbg/develop-core-configPhil Sturgeon1-73/+39
2012-01-08Merge pull request #882 from narfbg/develop-core-commonPhil Sturgeon1-61/+60
2012-01-08Merge pull request #880 from narfbg/develop-benchmarkPhil Sturgeon1-14/+9
2012-01-08Switch some public properties to protectedAndrey Andreev1-6/+4
2012-01-08Merge pull request #893 from narfbg/develop-core-uuPhil Sturgeon2-132/+95
2012-01-08Merge pull request #891 from narfbg/develop-core-loaderPhil Sturgeon1-60/+37
2012-01-08Merge pull request #890 from narfbg/develop-core-hlPhil Sturgeon2-44/+23
2012-01-08Remove loading of ['core'] elementsAndrey Andreev1-7/+0
2012-01-07Remove a space :)Andrey Andreev1-1/+1