summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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-20Merge pull request #5023 from vlakoff/db-escapeAndrey Andreev1-1/+1
Do not strip substrings looking like URL encode sequences
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-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-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>
2017-02-04Loading global mimes config file first, and then environment file.tianhe19861-8/+7
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-01-23[ci skip] Add changelog entry for PR #4030Andrey Andreev1-0/+1
2017-01-23Merge pull request #4030 from DiederikLascaris/developAndrey Andreev6-209/+305
Update welcome_message.php
2017-01-23Merge pull request #4990 from tianhe1986/develop_profilerAndrey Andreev1-5/+5
Two small changes with CI_Profiler
2017-01-23Merge pull request #4991 from verkhoumov/developAndrey Andreev1-5/+0
Removed dead code from show_error()
2017-01-22Removed wrapper and changed mix cases usage of hex colorcodesDiederikLascaris6-274/+248
2017-01-22Merge branch 'develop' of git://github.com/bcit-ci/CodeIgniter into developDiederikLascaris328-10283/+6738
2017-01-21Fixed show_error() for check $exit_statusDmitriy Verkhoumov1-5/+0
At the beginning of the function it checks whether a parameter $status_code is less than 100. Then the parameter $exit_status is formed by summing the $status_code + 9. In this case, the parameter $exit_status can not be more than 108, but somehow it is checked whether the value of the parameter $exit_status over 125. Such a situation can not occur under any circumstances.
2017-01-21Close <pre> tag.tianhe19861-3/+3
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-01-21Also convert single quotes.tianhe19861-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-01-17Merge pull request #4987 from tianhe1986/develop_qb_alias_table_cacheAndrey Andreev1-9/+15
Add aliased tables cache in query_builder.
2017-01-17Format fix。tianhe19861-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-01-171 Keep just 'list'.tianhe19861-13/+13
2 Using strict mode with in_array(). 3 Do not re-align. Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-01-17[ci skip] Merge pull request #4986 from ka7/feature/spellingAndrey Andreev40-49/+49
Spelling fixes in comment blocks and docs
2017-01-17Add aliased tables cache.tianhe19861-17/+23
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-01-16spelling fixes(1)klemens1-1/+1
2017-01-16spelling fixesklemens40-49/+49
2017-01-16[ci skip] Fix #4985Andrey Andreev1-1/+1
2017-01-11[ci skip] Merge pull request #4977 from ↵Andrey Andreev1-1/+1
fabiospampinato/fabiospampinato-loader-helper-regex-fix Fixed regex used for loading helpers
2017-01-11Fixed regex used for loading helpersFabio Spampinato1-1/+1
We want to exactly match a dot, so we have to escape it. I found the bug because in my project I load an helper named `session_php_helper.php`, so the `_php` part gets removed and the `session_helper.php` helper gets loaded instead, this way not even an error was shown.