Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2017-06-21 | Merge pull request #5159 from tianhe1986/develop_model_load | Andrey Andreev | 2 | -3/+23 | |
Always check a model be a subclass of CI_Model when loaded | |||||
2017-06-21 | Add unit test. | tianhe1986 | 1 | -1/+20 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-06-21 | Always check whether a model be a subclass of CI_Model when loaded. | tianhe1986 | 1 | -2/+3 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-06-19 | Merge branch '3.1-stable' into develop | Andrey Andreev | 13 | -78/+103 | |
Conflicts resolved: system/core/CodeIgniter.php tests/codeigniter/libraries/Form_validation_test.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst | |||||
2017-06-19 | [ci skip] Starting 3.1.6-dev | Andrey Andreev | 6 | -4/+26 | |
2017-06-19 | [ci skip] Prepare 3.1.5 release | Andrey Andreev | 5 | -7/+7 | |
2017-06-19 | [ci skip] Fix a bug in FV valid_email() | Andrey Andreev | 3 | -3/+7 | |
2017-06-15 | [ci skip] Add changelog entry for #5155 | Andrey Andreev | 1 | -0/+1 | |
2017-06-15 | Merge pull request #5155 from tianhe1986/develop_count_ignore_limit | Andrey Andreev | 2 | -1/+11 | |
Fix CI_DB_query_builder::count_all_results() returning wrong count with LIMIT/OFFSET | |||||
2017-06-15 | Merge pull request #5155 from tianhe1986/develop_count_ignore_limit | Andrey Andreev | 2 | -1/+11 | |
Fix CI_DB_query_builder::count_all_results() returning wrong count with LIMIT/OFFSET | |||||
2017-06-15 | Getting right num of rows with LIMIT usage. | tianhe1986 | 2 | -2/+2 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-06-15 | Revert "Ignore LIMIT when using CI_DB_query_builder::count_all_results" | tianhe1986 | 1 | -21/+3 | |
This reverts commit 9f6da3c2f11535fee09dd306ae6b884168e4623b. Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-06-15 | [ci skip] Merge pull request #5154 from angelxaces/patch-1 | Andrey Andreev | 1 | -1/+1 | |
Grammatical fix in ancillary_classes.rst doc | |||||
2017-06-15 | [ci skip] Merge pull request #5154 from angelxaces/patch-1 | Andrey Andreev | 1 | -1/+1 | |
Grammatical fix in ancillary_classes.rst doc | |||||
2017-06-15 | Adding unit test. | tianhe1986 | 1 | -0/+10 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-06-15 | Ignore LIMIT when using CI_DB_query_builder::count_all_results | tianhe1986 | 1 | -3/+21 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-06-14 | Create ancillary_classes.rst | Angel Aces | 1 | -1/+1 | |
"Normally, to call any of the available CodeIgniter methods requires you to use the ``$this`` construct::" - Grammatical adjustment. It appears that the author meshed two sentences together by starting with the proper noun that they ended the previous sentence but as it is the sentence reads: "Normally to call any of the available. CodeIgniter methods requires..." | |||||
2017-06-13 | [ci skip] Apply PR #5150 patch to pdo/oci and add changelog entry | Andrey Andreev | 2 | -1/+2 | |
2017-06-13 | [ci skip] Merge pull request #5150 from ↵ | Andrey Andreev | 1 | -1/+1 | |
ytetsuro/add-oracle-rename-column-to-keyword Fix DBForge triggering ORA-00946 while renaming columns | |||||
2017-06-13 | [ci skip] Merge pull request #5150 from ↵ | Andrey Andreev | 1 | -1/+1 | |
ytetsuro/add-oracle-rename-column-to-keyword Fix DBForge triggering ORA-00946 while renaming columns | |||||
2017-06-13 | add rename to keyword | ytetsuro | 1 | -1/+1 | |
2017-06-05 | [ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nits | Andrey Andreev | 7 | -9/+9 | |
Fix misc inconsistencies between code and doc comments | |||||
2017-06-05 | [ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nits | Andrey Andreev | 7 | -9/+9 | |
Fix misc inconsistencies between code and doc comments | |||||
2017-06-05 | Fix misc type inconsistencies between code and doc comments | Tyson Andre | 7 | -9/+9 | |
2017-05-25 | [ci skip] Fix #5131 | Andrey Andreev | 2 | -1/+2 | |
2017-05-25 | [ci skip] Doc changes following PR #5130 | Andrey Andreev | 3 | -2/+6 | |
2017-05-25 | Merge pull request #5130 from aroche/patch-2 | Andrey Andreev | 1 | -7/+1 | |
Allow arbitrary strings as extra attributes in form_label | |||||
2017-05-25 | Merge pull request #5130 from aroche/patch-2 | Andrey Andreev | 1 | -7/+1 | |
Allow arbitrary strings as extra attributes in form_label | |||||
2017-05-24 | fix bad attribute handling of form_label | aroche | 1 | -7/+1 | |
When passing a string for extra attributes in form_label helper function, these attributes were skipped. | |||||
2017-05-10 | Merge pull request #5112 from cerealbeer/develop | Andrey Andreev | 1 | -1/+1 | |
read() in DB_cache fails when catching E_WARNING with custom error handler | |||||
2017-05-10 | Merge pull request #5112 from cerealbeer/develop | Andrey Andreev | 1 | -1/+1 | |
read() in DB_cache fails when catching E_WARNING with custom error handler | |||||
2017-05-10 | Removing the error suppression op from the file_get_contents() call. | Giuseppe Marcelli | 1 | -1/+1 | |
2017-05-10 | Revert "Commit 4763c13c99eab2a720a4d6d913902e5cef4e76ec does not allow ↵ | Giuseppe Marcelli | 1 | -1/+1 | |
anymore to use the custom result object against cached database results, fixing this, for more info see issue 4665,1351" This reverts commit 8233b1d6fc56347195b3a0411806e197e2e59ad3. | |||||
2017-05-10 | Commit 4763c13c99eab2a720a4d6d913902e5cef4e76ec does not allow anymore to ↵ | Giuseppe Marcelli | 1 | -1/+1 | |
use the custom result object against cached database results, fixing this, for more info see issue 4665,1351 | |||||
2017-05-09 | read() in DB_cache does not fail when catching E_WARNING with custom error ↵ | Giuseppe Marcelli | 1 | -1/+1 | |
handler | |||||
2017-05-09 | [ci skip] Add changelog entry for PR #5108 | Andrey Andreev | 1 | -0/+1 | |
2017-05-09 | Merge pull request #5108 from ft23/patch-1 | Andrey Andreev | 1 | -0/+1 | |
quizzes singular doesn't work | |||||
2017-05-09 | Merge pull request #5108 from ft23/patch-1 | Andrey Andreev | 1 | -0/+1 | |
quizzes singular doesn't work | |||||
2017-05-06 | quizzes singular is doesnt work. | Fatih Turan | 1 | -0/+1 | |
2017-04-18 | [ci skip] Reduce nesting levels in CI_Output | Andrey Andreev | 1 | -51/+44 | |
2017-04-18 | [ci skip] Add changelog entry for #5084, PR #5085 | Andrey Andreev | 1 | -0/+1 | |
2017-04-18 | Merge pull request #5085 from jim-parry/fix/xmlrpc | Instructor, Computer Systems Technology | 1 | -1/+1 | |
Fix typo in serializeval() | |||||
2017-04-15 | Merge pull request #5085 from jim-parry/fix/xmlrpc | Instructor, Computer Systems Technology | 1 | -1/+1 | |
Fix typo in serializeval() | |||||
2017-04-10 | Fix typo in serializeval() | Master Yoda | 1 | -1/+1 | |
Signed-off-by:Master Yoda <jim_parry@bcit.ca> | |||||
2017-04-06 | [ci skip] Simplify some internal CI_Email code | Andrey Andreev | 1 | -16/+8 | |
2017-03-28 | [ci skip] Fix 5070 | Andrey Andreev | 2 | -1/+5 | |
2017-03-28 | [ci skip] Add changelog entry for PR #5067 | Andrey Andreev | 1 | -0/+1 | |
2017-03-28 | Merge pull request #5067 from gxgpet/develop | Andrey Andreev | 2 | -0/+22 | |
New Cache method: get_loaded_driver() | |||||
2017-03-28 | Updated Caching docs according to review | George Petculescu | 1 | -1/+1 | |
2017-03-26 | Added method separator as comment. | George Petculescu | 1 | -0/+2 | |