Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2017-02-15 | Do not fail if the array pointer is after the element | vlakoff | 1 | -0/+1 | |
2017-02-14 | Merge pull request #5018 from zploskey/download_helper_refactor | Andrey Andreev | 1 | -10/+5 | |
Don't duplicate is_file() and filesize() checks in download helper | |||||
2017-02-14 | Don't duplicate is_file and filesize checks | Zach Ploskey | 1 | -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-07 | Merge pull request #5010 from vlakoff/paths | Andrey Andreev | 4 | -5/+19 | |
Allow to omit trailing slash in config paths | |||||
2017-02-07 | Allow to omit trailing slash in config paths | vlakoff | 4 | -5/+19 | |
2017-02-06 | Merge pull request #5006 from tianhe1986/develop_common | Andrey Andreev | 1 | -8/+8 | |
Fix two bugs with Common Functions | |||||
2017-02-04 | Removing url encoded 127. | tianhe1986 | 1 | -0/+1 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-02-04 | Loading global mimes config file first, and then environment file. | tianhe1986 | 1 | -8/+7 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-01-23 | [ci skip] Add changelog entry for PR #4030 | Andrey Andreev | 1 | -0/+1 | |
2017-01-23 | Merge pull request #4030 from DiederikLascaris/develop | Andrey Andreev | 6 | -209/+305 | |
Update welcome_message.php | |||||
2017-01-23 | Merge pull request #4990 from tianhe1986/develop_profiler | Andrey Andreev | 1 | -5/+5 | |
Two small changes with CI_Profiler | |||||
2017-01-23 | Merge pull request #4991 from verkhoumov/develop | Andrey Andreev | 1 | -5/+0 | |
Removed dead code from show_error() | |||||
2017-01-22 | Removed wrapper and changed mix cases usage of hex colorcodes | DiederikLascaris | 6 | -274/+248 | |
2017-01-22 | Merge branch 'develop' of git://github.com/bcit-ci/CodeIgniter into develop | DiederikLascaris | 328 | -10283/+6738 | |
2017-01-21 | Fixed show_error() for check $exit_status | Dmitriy Verkhoumov | 1 | -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-21 | Close <pre> tag. | tianhe1986 | 1 | -3/+3 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-01-21 | Also convert single quotes. | tianhe1986 | 1 | -2/+2 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-01-17 | Merge pull request #4987 from tianhe1986/develop_qb_alias_table_cache | Andrey Andreev | 1 | -9/+15 | |
Add aliased tables cache in query_builder. | |||||
2017-01-17 | Format fix。 | tianhe1986 | 1 | -2/+2 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-01-17 | 1 Keep just 'list'. | tianhe1986 | 1 | -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/spelling | Andrey Andreev | 40 | -49/+49 | |
Spelling fixes in comment blocks and docs | |||||
2017-01-17 | Add aliased tables cache. | tianhe1986 | 1 | -17/+23 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-01-16 | spelling fixes(1) | klemens | 1 | -1/+1 | |
2017-01-16 | spelling fixes | klemens | 40 | -49/+49 | |
2017-01-16 | [ci skip] Fix #4985 | Andrey Andreev | 1 | -1/+1 | |
2017-01-11 | [ci skip] Merge pull request #4977 from ↵ | Andrey Andreev | 1 | -1/+1 | |
fabiospampinato/fabiospampinato-loader-helper-regex-fix Fixed regex used for loading helpers | |||||
2017-01-11 | Fixed regex used for loading helpers | Fabio Spampinato | 1 | -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. | |||||
2017-01-10 | Merge branch '3.1-stable' into develop | Andrey Andreev | 14 | -72/+207 | |
Conflicts resolved: system/core/CodeIgniter.php system/database/drivers/sqlite/sqlite_driver.php system/database/drivers/sqlite/sqlite_forge.php system/database/drivers/sqlite/sqlite_result.php system/database/drivers/sqlite/sqlite_utility.php system/helpers/email_helper.php system/helpers/smiley_helper.php system/libraries/Cart.php system/libraries/Email.php system/libraries/Image_lib.php system/libraries/Javascript.php system/libraries/Javascript/Jquery.php system/libraries/Session/SessionHandlerInterface.php user_guide_src/source/changelog.rst user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst | |||||
2017-01-10 | [ci skip] CI_Image_lib to set gd.jpeg_ignore_warning = 1 | Andrey Andreev | 2 | -0/+14 | |
See #4967 | |||||
2017-01-10 | Add a testcase and changelog entry for #4975 | Andrey Andreev | 2 | -2/+8 | |
2017-01-10 | Merge pull request #4975 from cfaulkner/fix_ci_prepare_view_vars | Andrey Andreev | 1 | -2/+2 | |
Fix an Undefined variable: object error in CI_Loader | |||||
2017-01-10 | Fix Undefined variable: object error | Chris Faulkner | 1 | -2/+2 | |
Change the undefined variable $object to $vars when calling get_object_vars(). This fixes an error when passing an object to a view. | |||||
2017-01-09 | [ci skip] Mark the beginning of 3.1.4-dev | Andrey Andreev | 6 | -4/+26 | |
2017-01-09 | [ci skip] Prepare 3.1.3 release | Andrey Andreev | 4 | -5/+5 | |
2017-01-09 | Merge branch 'security' into 3.1-stable | Andrey Andreev | 5 | -43/+85 | |
2017-01-06 | [ci skip] Add changelog entry for PR #4825 | Andrey Andreev | 1 | -1/+5 | |
2017-01-06 | Merge pull request #4825 from gxgpet/develop | Andrey Andreev | 1 | -9/+3 | |
Download helper improvement on reading phase | |||||
2017-01-06 | [ci skip] Add a changelog entry for #4765 | Andrey Andreev | 1 | -0/+1 | |
2017-01-06 | [ci skip] Don't set User-Agent header in CI_Email::clear() | Andrey Andreev | 1 | -1/+0 | |
Ref: #4765 | |||||
2017-01-06 | Merge pull request #4765 from viitols/develop | Andrey Andreev | 1 | -0/+1 | |
Fix CI_Email not sending User-Agent header | |||||
2017-01-06 | Merge pull request #4765 from viitols/develop | Andrey Andreev | 1 | -0/+1 | |
Fix CI_Email not sending User-Agent header | |||||
2017-01-06 | [ci skip] Cosmetich changes to CI_Image_lib::get_image_properties() | Andrey Andreev | 1 | -14/+15 | |
2017-01-06 | [ci skip] Add a changelog entry for #4457 | Andrey Andreev | 1 | -0/+1 | |
2017-01-06 | Merge pull request #4457 from KN4CK3R/develop | Andrey Andreev | 2 | -0/+6 | |
Fix CI_Image_lib::get_image_properties() invalid image handling | |||||
2017-01-06 | Merge pull request #4457 from KN4CK3R/develop | Andrey Andreev | 2 | -0/+6 | |
Fix CI_Image_lib::get_image_properties() invalid image handling | |||||
2017-01-06 | Fix FV's valid_mac() on PHP 5.4 | Andrey Andreev | 1 | -1/+1 | |
2017-01-06 | [ci skip] Add changelog entry for PR #4251 | Andrey Andreev | 1 | -0/+1 | |
2017-01-06 | [ci skip] A cosmetic change to the PR #4251 | Andrey Andreev | 1 | -2/+2 | |
2017-01-06 | [ci skip] Merge pull request #4251 from dimitribalazs/patch-2 | Andrey Andreev | 1 | -2/+3 | |
Added alt attribute functionality to captcha helper | |||||
2017-01-06 | [ci skip] Correct FV docs on valid_ip accepting a param | Andrey Andreev | 1 | -1/+1 | |