summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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
2017-02-15Merge pull request #5022 from vlakoff/download_helperAndrey Andreev1-0/+1
Do not fail if the array pointer is after the element
2017-02-15Do not fail if the array pointer is after the elementvlakoff1-0/+1
2017-02-14Merge pull request #5018 from zploskey/download_helper_refactorAndrey Andreev1-10/+5
Don't duplicate is_file() and filesize() checks in download helper
2017-02-14Don't duplicate is_file and filesize checksZach Ploskey1-10/+5
Move duplicate is_file and file_size checks out of if/else branches. Signed-off-by: Zach Ploskey <zach@ploskey.com>
2017-02-13Add user-guide.tianhe19861-0/+46
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-02-13Add unit test.tianhe19861-0/+70
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-02-13Adding having_in(), or_having_in(), having_not_in() and or_having_not_in().tianhe19861-0/+72
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-02-13Using _wh_in() instead of _where_in().tianhe19861-15/+22
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-02-13Merge pull request #5016 from zploskey/fix_userguide_versionAndrey Andreev1-2/+2
[ci skip] Increase version in userguide to 3.1.4-dev
2017-02-11Increase version in userguide to 3.1.4-devZach Ploskey1-2/+2
The version number was not increased after the 3.1.3 release.
2017-02-07Merge pull request #5010 from vlakoff/pathsAndrey Andreev4-5/+19
Allow to omit trailing slash in config paths
2017-02-07Allow to omit trailing slash in config pathsvlakoff4-5/+19
2017-02-06[ci skip] Add changelog entries for PR #5006Andrey Andreev1-0/+2
2017-02-06[ci skip] Eliminate a needless array_merge() call from PR #5006 patchAndrey Andreev1-6/+3
2017-02-06Merge pull request #5006 from tianhe1986/develop_commonAndrey Andreev1-8/+8
Fix two bugs with Common Functions
2017-02-06Merge pull request #5006 from tianhe1986/develop_commonAndrey Andreev1-8/+8
Fix two bugs with Common Functions
2017-02-04Removing url encoded 127.tianhe19861-0/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>