Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2018-01-09 | Annual copyright update | Master Yoda | 21 | -42/+42 | |
2017-11-15 | Merge branch '3.1-stable' into develop | Andrey Andreev | 2 | -13/+7 | |
Note: This intentionally reverts ee8324368f2844aae0d558f1d194419a2181c281 | |||||
2017-11-15 | Partially revert c9420849853a33a192c482e28c737e166d4fa698; close #5332 | Andrey Andreev | 1 | -0/+8 | |
2017-11-10 | Close #5330 | Andrey Andreev | 2 | -13/+7 | |
2017-11-09 | Refactor CI_Config, CI_Hooks interaction (close #5323) | Andrey Andreev | 2 | -17/+17 | |
2017-11-06 | [ci skip] Merge pull request #5321 from PrestigeT/documentation | Andrey Andreev | 1 | -1/+1 | |
Fixed docblock on model function. Changed @param model from string to mixed | |||||
2017-11-02 | Fixed docblock on model function. Changed @param model from string to mixed | Avrom | 1 | -1/+1 | |
2017-09-25 | Merge branch '3.1-stable' into develop | Andrey Andreev | 1 | -37/+35 | |
2017-09-25 | [ci skip] Mark the start of 3.1.7-dev | Andrey Andreev | 1 | -1/+1 | |
2017-09-25 | [ci skip] Prepare 3.1.6 release | Andrey Andreev | 1 | -1/+1 | |
2017-08-05 | Minor change in _display() method in CI_Output class allowing us to override ↵ | Erik Nord | 1 | -2/+2 | |
output data with an empty string. Without this change CI chooses to use the default "final_output" var; even though we passed an empty string to the method. | |||||
2017-07-06 | [ci skip] Merge pull request #5173 from Syafiqq/develop | Andrey Andreev | 1 | -1/+1 | |
Add array identifier for library loader docblock | |||||
2017-07-06 | Add array identifier for library loader | Syafiqq | 1 | -1/+1 | |
2017-06-28 | [ci skip] Remove redundant elses from CI_Loader::_ci_load_stock_library() | Andrey Andreev | 1 | -8/+4 | |
2017-06-28 | #5164 fix for stock libraries | Andrey Andreev | 1 | -10/+11 | |
2017-06-28 | Correct fix for #5164 | Andrey Andreev | 1 | -1/+1 | |
894a3f2c9fe111af35dee4f5e8e711259b893fb6 | |||||
2017-06-27 | Fix #5164 | Andrey Andreev | 1 | -20/+21 | |
2017-06-21 | Always check whether a model be a subclass of CI_Model when loaded. | tianhe1986 | 1 | -2/+3 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-06-19 | Merge branch '3.1-stable' into develop | Andrey Andreev | 2 | -52/+45 | |
Conflicts resolved: system/core/CodeIgniter.php tests/codeigniter/libraries/Form_validation_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 | |||||
2017-06-19 | [ci skip] Starting 3.1.6-dev | Andrey Andreev | 1 | -1/+1 | |
2017-06-19 | [ci skip] Prepare 3.1.5 release | Andrey Andreev | 1 | -1/+1 | |
2017-06-05 | [ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nits | Andrey Andreev | 3 | -3/+3 | |
Fix misc inconsistencies between code and doc comments | |||||
2017-06-05 | Fix misc type inconsistencies between code and doc comments | Tyson Andre | 3 | -3/+3 | |
2017-05-25 | [ci skip] Fix #5131 | Andrey Andreev | 1 | -1/+1 | |
2017-04-18 | [ci skip] Reduce nesting levels in CI_Output | Andrey Andreev | 1 | -51/+44 | |
2017-03-24 | Merge branch '3.1-stable' into develop | Andrey Andreev | 7 | -40/+44 | |
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] Mark the start of 3.1.5-dev | Andrey Andreev | 1 | -1/+1 | |
2017-03-20 | [ci skip] Prepare 3.1.4 release | Andrey Andreev | 1 | -1/+1 | |
2017-03-20 | Fix Apache header injection vulnerability in set_status_header() | Andrey Andreev | 1 | -5/+5 | |
2017-02-07 | Allow to omit trailing slash in config paths | vlakoff | 3 | -2/+16 | |
2017-02-06 | [ci skip] Eliminate a needless array_merge() call from PR #5006 patch | Andrey Andreev | 1 | -6/+3 | |
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-02-01 | Fix a CI_Input::set_cookie() bug | Andrey Andreev | 1 | -9/+7 | |
Found on StackOverflow: https://stackoverflow.com/questions/41925028/codeigniter-config-overrides-set-cookie-parameters | |||||
2017-01-23 | Merge pull request #4991 from verkhoumov/develop | Andrey Andreev | 1 | -5/+0 | |
Removed dead code from show_error() | |||||
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-20 | Don't use each() | Andrey Andreev | 1 | -2/+2 | |
Will be deprecated in PHP 7.2 | |||||
2017-01-19 | hash_pbkdf2() byte-safety again ... actually tell mbstring to use 8bit | Andrey Andreev | 1 | -2/+2 | |
2017-01-19 | hash_pbkdf2() byte-safety | Andrey Andreev | 1 | -4/+13 | |
2017-01-19 | More byte-safety | Andrey Andreev | 3 | -14/+14 | |
2017-01-17 | [ci skip] Merge pull request #4986 from ka7/feature/spelling | Andrey Andreev | 2 | -2/+2 | |
Spelling fixes in comment blocks and docs | |||||
2017-01-16 | spelling fixes(1) | klemens | 1 | -1/+1 | |
2017-01-16 | spelling fixes | klemens | 2 | -2/+2 | |
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 | 2 | -37/+37 | |
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 | 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 | 1 | -1/+1 | |
2017-01-09 | [ci skip] Prepare 3.1.3 release | Andrey Andreev | 1 | -1/+1 | |