summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-db-oci8Andrey Andreev14-722/+373
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 remote-tracking branch 'upstream/develop' into develop-db-oci8Andrey Andreev18-712/+475
2012-01-08Merge pull request #877 from narfbg/develop-helpers-tuxPhil Sturgeon3-88/+78
2012-01-08Switch private methods to protectedAndrey Andreev1-5/+5
2012-01-08Merge pull request #875 from narfbg/develop-issue-874Phil Sturgeon1-2/+2
2012-01-08Replace AND with &&Andrey Andreev1-6/+6
2012-01-08Swap two vars for readabilityAndrey Andreev1-1/+1
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 Sturgeon3-65/+48
2012-01-08Merge pull request #890 from narfbg/develop-core-hlPhil Sturgeon2-44/+23
2012-01-08Merge pull request #887 from narfbg/develop-core-routerPhil Sturgeon1-70/+37
2012-01-08Remove loading of ['core'] elementsAndrey Andreev3-12/+11
2012-01-08Improve database classesAndrey Andreev6-573/+270
2012-01-08Clear some spaces from index.phpAndrey Andreev1-34/+23
2012-01-07Remove a space :)Andrey Andreev1-1/+1