summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-03-15[ci skip] Add a changelog entry for PR #5431Andrey Andreev1-0/+1
2018-03-15Merge pull request #5431 from CyberSecutor/developAndrey Andreev1-4/+6
Added parenthesis check around "document" elements and fixed non-existent document.window filter to window.document
2018-03-15[ci skip] Fix #5435Andrey Andreev2-1/+15
2018-03-10[ci skip] Fix #5420Andrey Andreev2-2/+11
2018-03-10[ci skip] Add changelog entry for #5434Andrey Andreev1-0/+1
2018-03-10[ci skip] Merge pull request #5434 from xims/patch-3Andrey Andreev1-1/+4
Update Image_lib to avoid setting file permissions when not needed
2018-02-28[ci skip] Fix #5425Andrey Andreev2-1/+2
2018-02-28[ci skip] Fix 5423Andrey Andreev2-4/+5
2018-02-12[ci skip] Fix rendering of literal 'http://' strings in the manualAndrey Andreev3-6/+6
2018-01-31[ci skip] Add changelog entry for PR #5391Andrey Andreev1-0/+4
2018-01-30Fix a QB bug where where(), having() treated values passed to them as ↵Andrey Andreev2-23/+29
arbitrary SQL
2018-01-27[ci skip] Apply the INTL_IDNA_VARIANT_UTS46 fix to ↵Andrey Andreev1-1/+1
CI_Email::_validate_email_for_shell()
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-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-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-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
2017-12-27Merge pull request #5367 from carusogabriel/clean-elsesAndrey Andreev8-45/+24
Clean elses
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-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-20[ci skip] More docs updates following #5330Andrey Andreev5-24/+8
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-09[ci skip] Fix patch for #5300Andrey Andreev3-5/+5
2017-11-07[ci skip] Deprecate extra parameters of the CAPTCHA helperAndrey Andreev4-8/+26
2017-11-06[ci skip] Merge pull request #5326 from vinodselvin/patch-1Andrey Andreev1-2/+2
Bug in documentation
2017-11-06[ci skip] Merge pull request #5321 from PrestigeT/documentationAndrey Andreev1-1/+1
Fixed docblock on model function. Changed @param model from string to mixed
2017-10-25[ci skip] Merge pull request #5311 from gonzalo-massa/gonzalo-massa-patch-1Andrey Andreev1-0/+3
Download links for versions 2.2.4 to 2.2.6 added to docs
2017-10-16[ci skip] Use INTL_IDNA_VARIANT_UCS46 to convert non-ASCII domain names in ↵Andrey Andreev3-3/+11
emails Close #5300
2017-10-13Fix #5297Andrey Andreev2-4/+9
2017-10-12Merge pull request #5289 from zploskey/cleanup_form_validation_testsAndrey Andreev1-19/+21
Clean up form validation tests
2017-10-09[ci skip] Merge pull request #5295 from mamat-rahmat/fix-docs-code-blockAndrey Andreev1-2/+2
Fix broken .htaccess example code-block
2017-10-09[ci skip] Merge pull request #5292 from ajdunn2/developAndrey Andreev2-2/+2
Small spelling fix
2017-10-04[ci skip] Fix a typo in pagination docsAndrey Andreev1-2/+2
2017-10-03[ci skip] Add changelog entry for #5282Andrey Andreev1-0/+1
2017-10-03Merge pull request #5282 from pgee70/patch-1Andrey Andreev1-1/+1
Fix ORDER BY clauses being reset by count_all_results()
2017-10-03Update DB_query_builder.phppgee701-1/+1
recent changes broke query ordering giving a warning in line 1238 = '$this->qb_cache_orderby = array_merge($this->qb_cache_orderby, $qb_orderby);' this was because on subsequent re-queries, the qb_cache_orderby was set to NULL not Array() as it is should be (and is instantiated originally .