summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-06-21Merge pull request #5159 from tianhe1986/develop_model_loadAndrey Andreev2-3/+23
2017-06-21Add unit test.tianhe19861-1/+20
2017-06-21Always check whether a model be a subclass of CI_Model when loaded.tianhe19861-2/+3
2017-06-19Merge branch '3.1-stable' into developAndrey Andreev13-78/+103
2017-06-19[ci skip] Starting 3.1.6-devAndrey Andreev6-4/+26
2017-06-19[ci skip] Prepare 3.1.5 releaseAndrey Andreev5-7/+7
2017-06-19[ci skip] Fix a bug in FV valid_email()Andrey Andreev3-3/+7
2017-06-15[ci skip] Add changelog entry for #5155Andrey Andreev1-0/+1
2017-06-15Merge pull request #5155 from tianhe1986/develop_count_ignore_limitAndrey Andreev2-1/+11
2017-06-15Merge pull request #5155 from tianhe1986/develop_count_ignore_limitAndrey Andreev2-1/+11
2017-06-15Getting right num of rows with LIMIT usage.tianhe19862-2/+2
2017-06-15Revert "Ignore LIMIT when using CI_DB_query_builder::count_all_results"tianhe19861-21/+3
2017-06-15[ci skip] Merge pull request #5154 from angelxaces/patch-1Andrey Andreev1-1/+1
2017-06-15[ci skip] Merge pull request #5154 from angelxaces/patch-1Andrey Andreev1-1/+1
2017-06-15Adding unit test.tianhe19861-0/+10
2017-06-15Ignore LIMIT when using CI_DB_query_builder::count_all_resultstianhe19861-3/+21
2017-06-14Create ancillary_classes.rstAngel Aces1-1/+1
2017-06-13[ci skip] Apply PR #5150 patch to pdo/oci and add changelog entryAndrey Andreev2-1/+2
2017-06-13[ci skip] Merge pull request #5150 from ytetsuro/add-oracle-rename-column-to-...Andrey Andreev1-1/+1
2017-06-13[ci skip] Merge pull request #5150 from ytetsuro/add-oracle-rename-column-to-...Andrey Andreev1-1/+1
2017-06-13add rename to keywordytetsuro1-1/+1
2017-06-05[ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nitsAndrey Andreev7-9/+9
2017-06-05[ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nitsAndrey Andreev7-9/+9
2017-06-05Fix misc type inconsistencies between code and doc commentsTyson Andre7-9/+9
2017-05-25[ci skip] Fix #5131Andrey Andreev2-1/+2
2017-05-25[ci skip] Doc changes following PR #5130Andrey Andreev3-2/+6
2017-05-25Merge pull request #5130 from aroche/patch-2Andrey Andreev1-7/+1
2017-05-25Merge pull request #5130 from aroche/patch-2Andrey Andreev1-7/+1
2017-05-24fix bad attribute handling of form_labelaroche1-7/+1
2017-05-21add pre tag in config and session when arrayLloric Mayuga Garcia1-2/+14
2017-05-10Merge pull request #5112 from cerealbeer/developAndrey Andreev1-1/+1
2017-05-10Merge pull request #5112 from cerealbeer/developAndrey Andreev1-1/+1
2017-05-10Removing the error suppression op from the file_get_contents() call.Giuseppe Marcelli1-1/+1
2017-05-10Revert "Commit 4763c13c99eab2a720a4d6d913902e5cef4e76ec does not allow anymor...Giuseppe Marcelli1-1/+1
2017-05-10Commit 4763c13c99eab2a720a4d6d913902e5cef4e76ec does not allow anymore to use...Giuseppe Marcelli1-1/+1
2017-05-09read() in DB_cache does not fail when catching E_WARNING with custom error ha...Giuseppe Marcelli1-1/+1
2017-05-09[ci skip] Add changelog entry for PR #5108Andrey Andreev1-0/+1
2017-05-09Merge pull request #5108 from ft23/patch-1Andrey Andreev1-0/+1
2017-05-09Merge pull request #5108 from ft23/patch-1Andrey Andreev1-0/+1
2017-05-06quizzes singular is doesnt work.Fatih Turan1-0/+1
2017-04-18[ci skip] Reduce nesting levels in CI_OutputAndrey Andreev1-51/+44
2017-04-18[ci skip] Add changelog entry for #5084, PR #5085Andrey Andreev1-0/+1
2017-04-18Merge pull request #5085 from jim-parry/fix/xmlrpcInstructor, Computer Systems Technology1-1/+1
2017-04-15Merge pull request #5085 from jim-parry/fix/xmlrpcInstructor, Computer Systems Technology1-1/+1
2017-04-10Fix typo in serializeval()Master Yoda1-1/+1
2017-04-06[ci skip] Simplify some internal CI_Email codeAndrey Andreev1-16/+8
2017-03-28[ci skip] Fix 5070Andrey Andreev2-1/+5
2017-03-28[ci skip] Add changelog entry for PR #5067Andrey Andreev1-0/+1
2017-03-28Merge pull request #5067 from gxgpet/developAndrey Andreev2-0/+22
2017-03-28Updated Caching docs according to reviewGeorge Petculescu1-1/+1