summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2018-03-23Merge tag 'ci-upstream/3.1.8' into devFlorian Pritz9-39/+81
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-03-22[ci skip] Prepare 3.1.8 releaseAndrey Andreev1-1/+1
2018-03-20Merge tag 'ci-upstream/3.1.7' into devFlorian Pritz172-502/+585
Signed-off-by: Florian Pritz <bluewind@xinu.at>
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 Andreev1-1/+14
2018-03-10[ci skip] Fix #5420Andrey Andreev1-2/+10
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 Andreev1-1/+1
2018-02-28[ci skip] Fix 5423Andrey Andreev1-4/+3
2018-01-30Fix a QB bug where where(), having() treated values passed to them as ↵Andrey Andreev1-23/+28
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 Andreev1-1/+13
SMTP connections in CI_Email
2018-01-22Fix a bug where INTL_IDNA_VARIANT_UTS46 was used while undeclaredAndrey Andreev2-2/+2
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 Andreev1-1/+1
2018-01-13[ci skip] Prepare 3.1.7 releaseAndrey Andreev1-1/+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 Andreev172-344/+344
Annual copyright update Conflicts resolved: system/libraries/Cache/drivers/Cache_apcu.php
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 Andreev7-41/+22
Clean elses
2017-11-29[ci skip] Fix allow_get_array defaulting to FALSE if it doesn't existAndrey Andreev1-1/+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-15Partially revert c9420849853a33a192c482e28c737e166d4fa698; close #5332Andrey Andreev1-0/+8
2017-11-10Close #5330Andrey Andreev2-13/+7
2017-11-10Fix #5331Andrey Andreev1-1/+1
2017-11-09More on #5003Andrey Andreev2-8/+16
2017-11-09[ci skip] Fix patch for #5300Andrey Andreev2-3/+3
2017-11-07[ci skip] Deprecate extra parameters of the CAPTCHA helperAndrey Andreev1-4/+4
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-16[ci skip] Use INTL_IDNA_VARIANT_UCS46 to convert non-ASCII domain names in ↵Andrey Andreev2-3/+6
emails Close #5300
2017-10-13Fix #5297Andrey Andreev1-4/+8
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 .
2017-09-29[ci skip] Revert file permission change from PR #5278Andrey Andreev1-0/+0
2017-09-29Merge pull request #5278 from Uekawa/auto_linkAndrey Andreev1-1/+1
Fix auto_link trailing slash
2017-09-27Fix #5276Andrey Andreev2-16/+4
2017-09-25[ci skip] Mark the start of 3.1.7-devAndrey Andreev1-1/+1
2017-09-25[ci skip] Prepare 3.1.6 releaseAndrey Andreev1-1/+1
2017-09-25[ci skip] Fix potential object injection in apc cache driver; deprecate the ↵Andrey Andreev1-26/+22
apc driver
2017-09-16Remove left over debug statementFlorian Pritz1-1/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-13Fix #5260Andrey Andreev2-5/+61
2017-09-09WIP: CI3 migrationFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-09Merge tag '3.1.5' into dev-ci3Florian Pritz205-25180/+41342
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-04Fix #5246Andrey Andreev1-0/+1
2017-08-31Merge pull request #5243 from rosseti/fix/pdo-dblib-sqlserver-versionAndrey Andreev1-0/+16
Fix for DBLIB subdriver to get the right version number of SQL Server.
2017-08-25[ci skip] Fix #5236Andrey Andreev4-4/+4
2017-07-26[ci skip] Close #5206Andrey Andreev1-1/+1
2017-07-17[ci skip] escapeshellarg on the image src path passed to NetPBM by Image_libAndrey Andreev1-1/+1
2017-07-14[ci skip] Merge pull request #5183 from ytetsuro/add_oci8_driver_write_typeAndrey Andreev1-1/+1
add is_write_type method for merge query
2017-07-10[ci skip] Fix #5178 (regression caused by #5168)Andrey Andreev1-1/+1
2017-07-10[ci skip] Merge pull request #5128 from lloricode/profiler-pre-tagAndrey Andreev1-2/+14
Profiler add pre tag