summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-01-13Merge branch '3.1-stable' into developAndrey Andreev4-2/+28
2018-01-13[ci skip] Start 3.1.8-devAndrey Andreev6-4/+26
2018-01-13[ci skip] Prepare 3.1.7 releaseAndrey Andreev4-5/+5
2018-01-12[ci skip] Add changelog entry for PR #5379Andrey Andreev1-0/+1
2018-01-12[ci skip] Merge pull request #5379 from tianhe1986/develop_session_memcachedAndrey Andreev1-0/+2
Fix of Session_memcached_driver::_get_lock
2018-01-12[ci skip] Merge pull request #5379 from tianhe1986/develop_session_memcachedAndrey Andreev1-0/+2
Fix of Session_memcached_driver::_get_lock
2018-01-12Returning true when replace() succeed.tianhe19861-0/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2018-01-09[ci skip] Merge pull request #5376 from jim-parry/copyright-updateAndrey Andreev176-350/+350
Annual copyright update Conflicts resolved: system/libraries/Cache/drivers/Cache_apcu.php
2018-01-09[ci skip] Merge pull request #5376 from jim-parry/copyright-updateAndrey Andreev167-332/+332
Annual copyright update
2018-01-09Annual copyright updateMaster Yoda167-332/+332
2018-01-05[ci skip] Add changelog entry for PR #5369Andrey Andreev1-0/+1
2018-01-05[ci skip] Merge pull request #5369 from tianhe1986/develop_cache_memcacheAndrey Andreev1-2/+12
Cache_memcached: setting initial value with increment/decrement when not exist
2018-01-05[ci skip] Merge pull request #5369 from tianhe1986/develop_cache_memcacheAndrey Andreev1-2/+12
Cache_memcached: setting initial value with increment/decrement when not exist
2018-01-05Do not retry after calling add()tianhe19861-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2018-01-04Calling another increment/decrement if add() return FALSE.tianhe19861-4/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2018-01-02Calling add() after increment/decrement when the return value is FALSE.tianhe19861-4/+14
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-12-27Merge pull request #5367 from carusogabriel/clean-elsesAndrey Andreev8-45/+24
Clean elses
2017-12-27Merge pull request #5367 from carusogabriel/clean-elsesAndrey Andreev8-45/+24
Clean elses
2017-12-25Setting initial value with increment/decrement functions.tianhe19861-0/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-12-20Add extra line before returnGabriel Caruso1-0/+1
2017-12-20Merge pull request #5354 from carusogabriel/refactoring-testsAndrey Andreev23-76/+75
Refactoring tests Conflicts resolved: tests/codeigniter/core/Utf8_test.php tests/codeigniter/database/query_builder/group_test.php tests/codeigniter/libraries/Form_validation_test.php
2017-12-20Merge pull request #5354 from carusogabriel/refactoring-testsAndrey Andreev23-78/+78
Refactoring tests
2017-12-20Clean elsesGabriel Caruso8-45/+23
2017-12-20Refactoring testsGabriel Caruso23-78/+78
2017-12-04[ci skip] Fix #5348Andrey Andreev1-2/+2
2017-11-29[ci skip] Fix allow_get_array defaulting to FALSE if it doesn't existAndrey Andreev2-1/+2
2017-11-28[ci skip] Add changelog entry for PR #5342Andrey Andreev1-0/+1
2017-11-28[ci skip] Polish changes from PR #5342Andrey Andreev1-1/+3
2017-11-28[ci skip] Merge pull request #5342 from aanbar/pagination-bc-fixAndrey Andreev1-2/+3
Preserve attributes from pagination config files Related: #4454
2017-11-28[ci skip] Polish changes from PR #5342Andrey Andreev1-1/+3
2017-11-28[ci skip] Merge pull request #5342 from aanbar/pagination-bc-fixAndrey Andreev1-2/+3
Preserve attributes from pagination config files Related: #4454
2017-11-27Enable rel attribute by default #4000Ahmad Anbar1-0/+2
2017-11-26remove spacesAhmad Anbar1-1/+1
2017-11-26Fix issue #4454Ahmad Anbar1-3/+2
2017-11-20Merge branch '3.1-stable' into developAndrey Andreev5-24/+8
2017-11-20[ci skip] More docs updates following #5330Andrey Andreev5-24/+8
2017-11-15[ci skip] Update upgrade instructions for 3.2.0Andrey Andreev1-8/+48
2017-11-15Merge branch '3.1-stable' into developAndrey Andreev6-16/+21
Note: This intentionally reverts ee8324368f2844aae0d558f1d194419a2181c281
2017-11-15Partially revert c9420849853a33a192c482e28c737e166d4fa698; close #5332Andrey Andreev1-0/+8
2017-11-10Close #5330Andrey Andreev3-13/+8
2017-11-10Fix #5331Andrey Andreev3-1/+11
2017-11-10Try testing on PHP master branch builds too (allowed failures)Andrey Andreev1-0/+4
2017-11-09More on #5003Andrey Andreev2-8/+16
2017-11-09Move PHP 7.2 into the main testing matrixAndrey Andreev1-1/+0
2017-11-09Don't try to run 'DB=mysql' tests on PHP 7.2Andrey Andreev1-0/+2
2017-11-09Attempt PHP 7.2 tests on TravisAndrey Andreev1-0/+2
2017-11-09Try testing on PHP master branch builds too (allowed failures)Andrey Andreev1-0/+4
2017-11-09Move PHP 7.2 into the main testing matrixAndrey Andreev1-1/+0
2017-11-09Don't try to run 'DB=mysql' tests on PHP 7.2Andrey Andreev1-0/+2
2017-11-09Merge branch '3.1-stable' into developAndrey Andreev3-5/+5