summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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>
2017-02-04Loading global mimes config file first, and then environment file.tianhe19861-8/+7
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-02-01Fix a CI_Input::set_cookie() bugAndrey Andreev5-14/+13
Found on StackOverflow: https://stackoverflow.com/questions/41925028/codeigniter-config-overrides-set-cookie-parameters
2017-01-30[ci skip] Fix #5002Andrey Andreev1-2/+2
2017-01-23[ci skip] Add changelog entry for PR #4030Andrey Andreev1-0/+1
2017-01-23[ci skip] Add changelog entries for PR #4990Andrey Andreev1-0/+2
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-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-20Don't use each()Andrey Andreev3-23/+21
Will be deprecated in PHP 7.2
2017-01-19hash_pbkdf2() byte-safety again ... actually tell mbstring to use 8bitAndrey Andreev1-2/+2
2017-01-19hash_pbkdf2() byte-safetyAndrey Andreev2-5/+14
2017-01-19Again the Travis script line ... a typoAndrey Andreev1-1/+1
2017-01-19Fix Travis tests script lineAndrey Andreev1-1/+1
2017-01-19More byte-safetyAndrey Andreev7-28/+31
2017-01-19Fix byte-safety issues & actually test for themAndrey Andreev9-30/+93
2017-01-17[ci skip] Add changelog entry for #4987Andrey Andreev1-0/+1
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-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 Andreev39-48/+48
Spelling fixes in comment blocks and docs
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-17Address #4980Andrey Andreev1-13/+14
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] Add a changelog entry for 37226c036a52ae857b13109774b1cdfc4b1d4db9Andrey Andreev1-0/+1
2017-01-11Merge branch 'feature/sess_db_destroy' into 3.1-stableAndrey Andreev1-5/+5
2017-01-11[ci skip] Add changelog entry for #4977Andrey Andreev1-0/+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-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.
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-07 11:17:17 +0100