summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-02-13Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developqichengzx1-12/+3
2018-02-12[ci skip] More polish on the download helperAndrey Andreev1-10/+3
2018-02-12[ci skip] Merge pull request #5403 from ↵Andrey Andreev1-3/+1
ytetsuro/fix/#5394/not-change-charset-bug Fixed bug that download filename character code did not change
2018-02-11complement the missing HTTP status codesqichengzx1-0/+13
2018-02-08Fixed bug that character code did not changeytetsuro1-3/+1
2018-02-07[ci skip] Finalize changes from PR #5394Andrey Andreev2-10/+16
2018-02-07[ci skip] Merge pull request #5394 from ytetsuro/fix/rfc6266Andrey Andreev1-1/+13
Give force_download a header conforming to RFC 6266
2018-02-05Changed to include Content-Disposition parameters in variablesytetsuro1-6/+6
2018-02-05change variable nameytetsuro1-3/+3
2018-02-05Determine exactly whether converted filename is falseytetsuro1-1/+1
2018-02-05change use direct convert_to_utf8 methodytetsuro1-2/+2
2018-02-05refactor use Utf8 classytetsuro1-6/+3
2018-02-05change filename. convert to utf-8ytetsuro1-1/+16
2018-02-05fix rfc6266ytetsuro1-1/+1
2018-01-31Merge pull request #5391 from mehdibo/fix/url-helperAndrey Andreev1-1/+1
Prevent tab hijacking when using the URL helper
2018-01-28Added rel attribute to auto_link()Mehdi Bounya1-1/+1
Fixed security issue: allowing the target page to take control of the original page Details about the issue here: https://mathiasbynens.github.io/rel-noopener/
2018-01-22Merge branch '3.1-stable' into developAndrey Andreev3-4/+30
Conflicts resolved: system/libraries/Email.php system/libraries/Form_validation.php
2018-01-22[ci skip] If possible, always negotiate for TLS 1.0, TLS 1.1, TLS 1.2 for ↵Andrey Andreev2-2/+16
SMTP connections in CI_Email
2018-01-22Fix a bug where INTL_IDNA_VARIANT_UTS46 was used while undeclaredAndrey Andreev3-2/+8
The constant was introduced in PHP 5.4, and is documented that way, but it actually depends on PHP being linked to ICU 4.6+, while the minimum requirement for compilation is 4.0 ... When this happens on PHP 7.2, an E_DEPRECATED notice will be emitted; there's currently a discussion on php-internals to resolve that issue.
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