summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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.
2017-01-10Merge branch '3.1-stable' into developAndrey Andreev14-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 = 1Andrey Andreev2-0/+14
See #4967
2017-01-10Add a testcase and changelog entry for #4975Andrey Andreev2-2/+8
2017-01-10Merge pull request #4975 from cfaulkner/fix_ci_prepare_view_varsAndrey Andreev1-2/+2
Fix an Undefined variable: object error in CI_Loader
2017-01-10Fix Undefined variable: object errorChris Faulkner1-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-devAndrey Andreev6-4/+26
2017-01-09[ci skip] Prepare 3.1.3 releaseAndrey Andreev4-5/+5
2017-01-09Merge branch 'security' into 3.1-stableAndrey Andreev5-43/+85
2017-01-06[ci skip] Add changelog entry for PR #4825Andrey Andreev1-1/+5
2017-01-06Merge pull request #4825 from gxgpet/developAndrey Andreev1-9/+3
Download helper improvement on reading phase
2017-01-06[ci skip] Add a changelog entry for #4765Andrey Andreev1-0/+1
2017-01-06[ci skip] Don't set User-Agent header in CI_Email::clear()Andrey Andreev1-1/+0
Ref: #4765
2017-01-06Merge pull request #4765 from viitols/developAndrey Andreev1-0/+1
Fix CI_Email not sending User-Agent header
2017-01-06Merge pull request #4765 from viitols/developAndrey Andreev1-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 Andreev1-14/+15
2017-01-06[ci skip] Add a changelog entry for #4457Andrey Andreev1-0/+1
2017-01-06Merge pull request #4457 from KN4CK3R/developAndrey Andreev2-0/+6
Fix CI_Image_lib::get_image_properties() invalid image handling
2017-01-06Merge pull request #4457 from KN4CK3R/developAndrey Andreev2-0/+6
Fix CI_Image_lib::get_image_properties() invalid image handling
2017-01-06Fix FV's valid_mac() on PHP 5.4Andrey Andreev1-1/+1
2017-01-06[ci skip] Add changelog entry for PR #4251Andrey Andreev1-0/+1
2017-01-06[ci skip] A cosmetic change to the PR #4251Andrey Andreev1-2/+2
2017-01-06[ci skip] Merge pull request #4251 from dimitribalazs/patch-2Andrey Andreev1-2/+3
Added alt attribute functionality to captcha helper
2017-01-06[ci skip] Correct FV docs on valid_ip accepting a paramAndrey Andreev1-1/+1
2017-01-06Add valid_mac() FV ruleAndrey Andreev5-2/+41
Close #3992
2017-01-06[ci skip] Add a changelog entry for #4963Andrey Andreev1-0/+1
2017-01-06[ci skip] Add a changelog entry for #4962Andrey Andreev1-0/+1
2017-01-06[ci skip] Add an empty line to PR #4962 patchAndrey Andreev1-0/+1
2017-01-06[ci skip] Add an empty line to PR #4962 patchAndrey Andreev1-0/+1
2017-01-06[ci skip] Merge pull request #4962 from ytetsuro/patch-2Andrey Andreev1-1/+2
oci8_forge add column bug fix
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-16 05:31:25 +0100