Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2019-03-15 | Fix code style | Michael Long | 1 | -1/+2 | |
2019-03-15 | Refactor behaviors with different ttl of lock_key | Michael Long | 1 | -7/+7 | |
2019-03-02 | Resolve race condition in redis driven session key get_lock | Michael Long | 1 | -2/+3 | |
2019-01-08 | Merge branch '3.1-stable' into develop | Andrey Andreev | 5 | -7/+9 | |
Conflicts resolved: 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/captcha_helper.php system/helpers/email_helper.php system/helpers/inflector_helper.php system/helpers/smiley_helper.php system/language/english/form_validation_lang.php system/libraries/Cart.php system/libraries/Form_validation.php system/libraries/Javascript.php system/libraries/Javascript/Jquery.php system/libraries/Session/SessionHandlerInterface.php tests/codeigniter/helpers/inflector_helper_test.php user_guide_src/source/helpers/inflector_helper.rst | |||||
2019-01-02 | Merge pull request #5662 from jim-parry/copyright2019 | Instructor, BCIT | 7 | -20/+20 | |
Update copyright date to 2019 | |||||
2018-12-27 | Update copyright date to 2019 | Jim Parry | 6 | -12/+12 | |
2018-08-22 | [ci skip] Changelog entry for #5545, PR #5563 | Andrey Andreev | 1 | -1/+1 | |
2018-08-07 | fix #5545 | Michiel Vugteveen | 5 | -6/+8 | |
2018-06-15 | Merge branch '3.1-stable' into develop | Andrey Andreev | 1 | -1/+1 | |
2018-06-15 | [ci skip] Fix #5526 | Andrey Andreev | 1 | -1/+1 | |
2018-06-12 | Merge branch '3.1-stable' into develop | Andrey Andreev | 6 | -1/+99 | |
Conflicts resolved: system/core/CodeIgniter.php system/libraries/Email.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 | |||||
2018-06-12 | [ci skip] Prepare 3.1.9 release | Andrey Andreev | 5 | -0/+98 | |
2018-05-18 | http:// to https:// | Mehdi Bounya | 6 | -12/+12 | |
2018-05-01 | [ci skip] Close #5487 | Andrey Andreev | 1 | -1/+1 | |
2018-01-12 | [ci skip] Merge pull request #5379 from tianhe1986/develop_session_memcached | Andrey Andreev | 1 | -0/+2 | |
Fix of Session_memcached_driver::_get_lock | |||||
2018-01-12 | Returning true when replace() succeed. | tianhe1986 | 1 | -0/+2 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2018-01-09 | [ci skip] Merge pull request #5376 from jim-parry/copyright-update | Andrey Andreev | 7 | -14/+14 | |
Annual copyright update Conflicts resolved: system/libraries/Cache/drivers/Cache_apcu.php | |||||
2018-01-09 | Annual copyright update | Master Yoda | 6 | -12/+12 | |
2017-12-27 | Merge pull request #5367 from carusogabriel/clean-elses | Andrey Andreev | 1 | -4/+2 | |
Clean elses | |||||
2017-12-20 | Clean elses | Gabriel Caruso | 1 | -4/+2 | |
2017-07-06 | [ci skip] Merge pull request #5170 from ↵ | Andrey Andreev | 2 | -3/+8 | |
tianhe1986/develop_session_race_condition Decreasing the probability of race condition in session lock | |||||
2017-07-06 | Format fixing. | tianhe1986 | 2 | -5/+3 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-07-05 | Simplifying the code. | tianhe1986 | 2 | -12/+6 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-07-05 | Acquiring memcached lock with add() to avoid race conditions. | tianhe1986 | 1 | -2/+6 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-07-05 | Acquiring redis lock with existence check. | tianhe1986 | 1 | -1/+10 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-06-05 | [ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nits | Andrey Andreev | 1 | -1/+1 | |
Fix misc inconsistencies between code and doc comments | |||||
2017-06-05 | Fix misc type inconsistencies between code and doc comments | Tyson Andre | 1 | -1/+1 | |
2017-03-24 | Merge branch '3.1-stable' into develop | Andrey Andreev | 2 | -9/+9 | |
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-01-19 | More byte-safety | Andrey Andreev | 1 | -4/+4 | |
2017-01-11 | [ci skip] Fix an error with DB sessions triggered with regenerate + destroy | Andrey Andreev | 1 | -5/+5 | |
2017-01-03 | [ci skip] Update year number in remaining files that were recently deleted ↵ | Andrey Andreev | 1 | -2/+2 | |
from develop | |||||
2017-01-03 | Update copyright data to 2017 | Master Yoda | 6 | -12/+12 | |
2016-12-31 | Update copyright data to 2017 | Master Yoda | 6 | -12/+12 | |
2016-12-14 | Drop all PHP 5.3-related code | Andrey Andreev | 2 | -79/+1 | |
2016-12-01 | Merge branch '3.1-stable' into develop | Andrey Andreev | 3 | -43/+35 | |
2016-11-29 | Fix #4923 | Andrey Andreev | 3 | -41/+33 | |
2016-11-22 | Fix #4916 | Andrey Andreev | 1 | -2/+2 | |
2016-10-28 | Merge branch '3.1-stable' into develop | Andrey Andreev | 2 | -8/+119 | |
Resolved conflicts: system/core/CodeIgniter.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/form_validation.rst | |||||
2016-10-27 | [ci skip] Another attempt at #4874 | Andrey Andreev | 1 | -2/+3 | |
2016-10-27 | Fix #4874 | Andrey Andreev | 1 | -9/+54 | |
2016-10-22 | Close #4830, #3649 | Andrey Andreev | 2 | -6/+48 | |
2016-10-03 | Fix #4823 | Andrey Andreev | 1 | -2/+25 | |
2016-08-10 | Merge branch '3.1-stable' into develop | Andrey Andreev | 2 | -18/+5 | |
2016-07-28 | Remove dead code written for PHP 5.2 | Andrey Andreev | 1 | -12/+3 | |
2016-07-28 | [ci skip] Fix #3919, #4732 | Andrey Andreev | 1 | -6/+2 | |
2016-07-26 | Merge branch '3.1-stable' into develop | Andrey Andreev | 4 | -2/+7 | |
Conflicts resolved: .travis.yml system/core/CodeIgniter.php system/database/drivers/oci8/oci8_forge.php system/database/drivers/pdo/subdrivers/pdo_oci_forge.php system/helpers/path_helper.php system/libraries/Email.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/contributing/index.rst user_guide_src/source/general/requirements.rst user_guide_src/source/general/styleguide.rst user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrade_310.rst user_guide_src/source/installation/upgrading.rst | |||||
2016-07-19 | [ci skip] Fix an undefined index for 'timeout' in Redis session driver | Andrey Andreev | 1 | -2/+3 | |
http://forum.codeigniter.com/thread-64219.html | |||||
2016-05-26 | [ci skip] Fix a minor Redis Session bug | Andrey Andreev | 1 | -1/+1 | |
2016-05-20 | Merge pull request #4638 from kasimtan/phpdoc_fixes | Andrey Andreev | 1 | -1/+1 | |
[ci skip] Fixed PHPDoc parameter name and type discrepancies | |||||
2016-05-19 | Fixed PHPDoc parameter name and type discrepancies | Kasim Tan | 1 | -1/+1 | |