summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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
Fix misc inconsistencies between code and doc comments
2017-06-05Fix misc type inconsistencies between code and doc commentsTyson Andre7-9/+9
2017-05-25Merge pull request #5130 from aroche/patch-2Andrey Andreev1-7/+1
Allow arbitrary strings as extra attributes in form_label
2017-05-24fix bad attribute handling of form_labelaroche1-7/+1
When passing a string for extra attributes in form_label helper function, these attributes were skipped.
2017-05-10Merge pull request #5112 from cerealbeer/developAndrey Andreev1-1/+1
read() in DB_cache fails when catching E_WARNING with custom error handler
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 ↵Giuseppe Marcelli1-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-10Commit 4763c13c99eab2a720a4d6d913902e5cef4e76ec does not allow anymore to ↵Giuseppe Marcelli1-1/+1
use the custom result object against cached database results, fixing this, for more info see issue 4665,1351
2017-05-09read() in DB_cache does not fail when catching E_WARNING with custom error ↵Giuseppe Marcelli1-1/+1
handler
2017-05-09Merge pull request #5108 from ft23/patch-1Andrey Andreev1-0/+1
quizzes singular doesn't work
2017-05-06quizzes singular is doesnt work.Fatih Turan1-0/+1
2017-04-15Merge pull request #5085 from jim-parry/fix/xmlrpcInstructor, Computer Systems Technology1-1/+1
Fix typo in serializeval()
2017-04-10Fix typo in serializeval()Master Yoda1-1/+1
Signed-off-by:Master Yoda <jim_parry@bcit.ca>
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
New Cache method: get_loaded_driver()
2017-03-28Updated Caching docs according to reviewGeorge Petculescu1-1/+1
2017-03-26Added method separator as comment.George Petculescu1-0/+2
2017-03-26Added get_loaded_driver() method to Cache.php; updated docs.George Petculescu2-0/+20
2017-03-24Merge branch '3.1-stable' into developAndrey Andreev47-157/+278
Conflicts resolved: system/core/CodeIgniter.php system/core/Common.php system/core/Input.php system/helpers/cookie_helper.php tests/codeigniter/helpers/html_helper_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 user_guide_src/source/libraries/input.rst
2017-03-20[ci skip] Fix 3.1.4 release date ...Andrey Andreev1-1/+1
Apparently, I'm from the future.
2017-03-20[ci skip] Mark the start of 3.1.5-devAndrey Andreev6-4/+26
2017-03-20[ci skip] Prepare 3.1.4 releaseAndrey Andreev4-5/+5
2017-03-20Fix Apache header injection vulnerability in set_status_header()Andrey Andreev2-6/+7
2017-03-20Fix #5057Andrey Andreev2-2/+3
2017-03-14Fix #5050Andrey Andreev11-11/+12
2017-03-08[ci skip] Remove an obsolete note from routing docsAndrey Andreev1-3/+0
2017-03-06Fix #5044; add unit tests for img() HTML helperAndrey Andreev4-6/+21
2017-03-01[ci skip] Remove a misleading comment from the docblock for random_string()Andrey Andreev1-3/+1
2017-02-21[ci skip] Changelog, docs changes following PR #5025Andrey Andreev2-7/+21
2017-02-21Merge pull request #5025 from katsew/introduce-apcu-driverAndrey Andreev2-0/+220
Add APCu driver to CI_Cache
2017-02-21[ci skip] Reduce excessive indentation in QB group_by(), having() testsAndrey Andreev1-33/+32
2017-02-21[ci skip] Add changelog entry for PR #5017Andrey Andreev1-0/+4
2017-02-21Merge pull request #5017 from tianhe1986/develop_having_inAndrey Andreev3-15/+210
DB_query_builder: Adding having_in(), or_having_in(), having_not_in() and or_having_not_in()
2017-02-21Use less indentation.tianhe19861-22/+22
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-02-20Remove serialization/deserialization arraykatsew1-3/+3
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Remove specific argument from abstractionkatsew1-3/+2
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Align with spaceskatsew1-3/+3
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Remove unused link commentkatsew1-1/+0
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Change author to dev teamkatsew1-1/+1
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Change version commentkatsew1-1/+1
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20[ci skip] Add changelog entry for PR #5010Andrey Andreev1-0/+1
2017-02-20[ci skip] Add a changelog entry for #4815, PR #5023Andrey Andreev1-0/+1
2017-02-20Do not strip substrings looking like URL encode sequencesvlakoff1-1/+1
2017-02-20Merge pull request #5023 from vlakoff/db-escapeAndrey Andreev1-1/+1
Do not strip substrings looking like URL encode sequences
2017-02-20[ci skip] Add a note on xss_clean() and HTML attributesAndrey Andreev1-2/+9
2017-02-20Add apcu driver into valid driver listkatsew1-0/+1
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Correct method and docskatsew1-16/+16
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Create Cache_apcu class and copy source from Cache_apc classkatsew1-0/+221
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-16Do not strip substrings looking like URL encode sequencesvlakoff1-1/+1