summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-04-09Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into developftwbzhao22-50/+432
2015-04-09Merge pull request #3753 from ftwbzhao/feature/ci/3.0Andrey Andreev1-2/+2
2015-04-09[fix] redis get_metadataftwbzhao1-1/+1
2015-04-09use = instead of +=ftwbzhao1-1/+1
2015-04-08[ci skip] Fix comment typosAndrey Andreev2-2/+2
2015-04-08Merge pull request #3748 from MUlt1mate/developAndrey Andreev1-1/+1
2015-04-08typomult1mate1-1/+1
2015-04-07[feature] check redis auth failedftwbzhao1-1/+5
2015-04-06Disallow empty FV rules ... for consistencyAndrey Andreev1-7/+5
2015-04-06Move strtolower() call from PR #3739 out of the loopAndrey Andreev1-3/+2
2015-04-06Merge remote-tracking branch 'upstream/develop' into developAhmad Anbar135-593/+1654
2015-04-06Merge pull request #3739 from yahyaerturan/developAndrey Andreev1-0/+3
2015-04-06#3727 Lowercase $side variable for $this->db->like() in Query BuilderYahya Erturan1-0/+3
2015-04-05Merge pull request #3730 from paralogizing/developAndrey Andreev1-1/+1
2015-04-04Fix #3733Andrey Andreev2-5/+6
2015-04-04Merge pull request #3731 from LouisMilotte/patch-1Andrey Andreev1-2/+2
2015-04-04Edit dbforge drop_table line 230LouisMilotte1-2/+2
2015-04-04Matched root_path's slashes with the name being replacedKyle Gadd1-1/+1
2015-04-02Merge pull request #3723 from sentabi/patch-1Andrey Andreev1-2/+2
2015-04-02fixing typoSentabi1-2/+2
2015-04-01[ci skip] Update version numbersAndrey Andreev2-3/+3
2015-04-01Mitigate potential DoS attacks against hash_pbkdf2()Andrey Andreev2-4/+61
2015-04-01[ci skip] Whitespace cleanup following PR #3716Andrey Andreev1-29/+29
2015-04-01Merge pull request #3722 from achraf52/patch-1Andrey Andreev1-1/+1
2015-04-01Merge pull request #3716 from djwoods/form_validation_testsAndrey Andreev1-1/+249
2015-04-01Fixed typoAchraf Almouloudi1-1/+1
2015-04-01Style changes and variable name changesDavid Woods1-22/+21
2015-03-31[ci skip] Fix a wrong docblock linkAndrey Andreev1-1/+1
2015-03-31[ci skip] Update security recommendationsAndrey Andreev1-4/+8
2015-03-31Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developAndrey Andreev1-1/+1
2015-03-31[ci skip] Update version numberAndrey Andreev3-5/+3
2015-03-31Merge pull request #3718 from mwhitneysdsu/mwhitneysdsu/developAndrey Andreev1-1/+1
2015-03-30Fix whitespace in previous commitmwhitneysdsu1-1/+1
2015-03-30Fix for parsing error in PHP 5.2 and 5.3David Woods1-1/+2
2015-03-30Fix logged path to match checked path in loadermwhitneysdsu1-1/+1
2015-03-30Corrected unit tests for set_select, set_radio, and set_checkboxDavid Woods1-32/+27
2015-03-30[ci skip] Fix a broken link in the changelogAndrey Andreev1-1/+1
2015-03-30[ci skip] Whitespace cleanup following PRs #3713 #3714Andrey Andreev2-16/+15
2015-03-30Merge pull request #3713 from ahnh/UnitTest_Lang_testAndrey Andreev1-0/+26
2015-03-30Merge pull request #3714 from ahnh/UnitTest_LoaderAndrey Andreev1-0/+46
2015-03-30Merge origin/develop into UnitTest_LoaderHeesung Ahn1-1/+1
2015-03-30changed to lowercase array.Heesung Ahn1-1/+1
2015-03-30Merge origin/develop into UnitTest_Lang_testHeesung Ahn1-1/+1
2015-03-30changed to lowercase array and space.Heesung Ahn1-3/+3
2015-03-30Fix #3717Andrey Andreev1-1/+1
2015-03-30Merge origin/develop into UnitTest_LoaderHeesung Ahn1-6/+9
2015-03-30updated array style and removed assert trueHeesung Ahn1-2/+5
2015-03-30Merge origin/develop into UnitTest_Lang_testHeesung Ahn1-6/+9
2015-03-30added spacesHeesung Ahn1-1/+1
2015-03-30Merge pull request #3710 from toulet/developAndrey Andreev1-6/+9