summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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 .
2017-10-02[ci skip] Merge pull request #5281 from pawelkg/developAndrey Andreev1-2/+2
Adding some letters translated to Y in foregin_chars.php
2017-09-29Add testcase and changelog entry for #5278Andrey Andreev2-2/+4
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 Andreev3-16/+9
2017-09-26Fix incorrect table name in migration 20 for postgresFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-26Merge CodeIgniter 3 supportFlorian Pritz284-25873/+43111
2017-09-26NEWS: Mention PHP 7.2 supportFlorian Pritz1-0/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-26Put base_url in example config fileFlorian Pritz1-0/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-26Migration 20: Fix id column sizeFlorian Pritz1-1/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-25[ci skip] Mark the start of 3.1.7-devAndrey Andreev6-4/+26
2017-09-25[ci skip] Prepare 3.1.6 releaseAndrey Andreev4-5/+5
2017-09-25[ci skip] Add upgrade instructions about the APC deprecationAndrey Andreev1-0/+14
2017-09-25[ci skip] Fix potential object injection in apc cache driver; deprecate the ↵Andrey Andreev2-26/+27
apc driver
2017-09-22Explain username rules on registration pageFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-21Remove usage of deprecated is_cli_request()Florian Pritz4-6/+6
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-21Remove usage of deprecated valid_email functionFlorian Pritz1-2/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-21Fix return checks for CI3Florian Pritz3-5/+9
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-21Fix additional routes for CI3Florian Pritz1-2/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-21Close session in long running methodsFlorian Pritz1-0/+2
These do not write to the session but may run for some time. There is no need to keep the session locked while they perform their work. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-21Fix detection of URL ending in slashFlorian Pritz1-1/+1
CI trims tailing slashes from the URL and this should work just fine too. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-21Fix mutlipaste_queue test using incorrect data in mockFlorian Pritz1-2/+2
The error return changed with CI3 so the test also needs to change Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-21Test: Replace unprintable characters when dumping variablesFlorian Pritz1-0/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-21Tests: Use is instead of ok for improved debug outputFlorian Pritz1-2/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-18Automatically set baseurl for testsFlorian Pritz1-0/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-18Fix download driver for CI3Florian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-18Migrate return code checks for CI3Florian Pritz6-15/+15
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-18Fix customautoloader class nameFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-18Remove secondary controller for CLI usage outputFlorian Pritz3-13/+17
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-18Fix some routesFlorian Pritz1-3/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-18Remove unsupported secondary controllerFlorian Pritz3-31/+35
Having more than one controller per request doesn't work with CI3. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-16[ci skip] Merge pull request #5265 from mehdibo/patch-1Andrey Andreev1-1/+1
Fixed dbprefix() documentation
2017-09-16Remove left over debug statementFlorian Pritz1-1/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-16Make NEWS more readableFlorian Pritz1-3/+6
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-16Remove old error templateFlorian Pritz1-11/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-16Update negativ return check of session userdata for CI3Florian Pritz2-3/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-16NEWS: Mention that CI3 requires base_url to be setFlorian Pritz1-0/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-16Update ci_session table for CI3Florian Pritz2-1/+43
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-16wipFlorian Pritz1-1/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-13Fix #5260Andrey Andreev3-5/+63
2017-09-09WIP: CI3 migrationFlorian Pritz18-13/+72
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-09Merge tag '3.1.5' into dev-ci3Florian Pritz257-25784/+42894
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-04Fix Travis-CI failuresAndrey Andreev1-0/+1
2017-09-04Fix #5246Andrey Andreev2-0/+2
2017-08-31[ci skip] Add changelog entry for #5243Andrey 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 Andreev5-4/+5
2017-08-15tools/update_database: Output status after upgradeFlorian Pritz1-1/+10
Signed-off-by: Florian Pritz <bluewind@xinu.at>