Isaac Bennetch 253894e299 Resolve merge conflicts with ChangeLog ...

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>

2016-11-24 11:03:58 -05:00

..

_data

Fix typos.

2014-11-02 18:32:42 +01:00

config

Add tests

2016-10-12 14:03:57 +05:30

controllers

Fix tests in Navigation, TableSearchController

2016-10-29 11:17:57 +05:30

dbi

These test need runkit_internal_override enabled

2016-01-25 09:42:04 +01:00

engines

Adjust tests to recent changes

2016-07-12 11:17:47 +02:00

gis

Fix includes in testsuite

2015-12-01 14:22:28 +01:00

navigation

Fixed some tests in Export, Import and Node

2016-11-04 14:21:02 +05:30

plugin

Remove tests against unsupported versions

2016-11-07 20:42:28 +05:30

properties

Allow to specify name and text directly in OptionsPropertyItem contructor

2016-01-05 15:04:02 +01:00

schema

Remove require of libraries included in test bootstrap

2016-01-12 16:43:16 +01:00

AdvisorTest.php

Add rel="noopener noreferrer" to all external target="_blank" links

2016-08-18 17:35:20 +02:00

ConfigGeneratorTest.php

Merge branch 'QA_4_5' into QA_4_6

2016-02-12 15:44:39 +01:00

ConfigTest.php

Ensure PmaAbsoluteUri ends with /

2016-08-17 15:37:20 +02:00

DatabaseInterfaceTest.php

Move the rest of the tests related to objects under a common parent test

2015-12-18 21:32:34 +11:00

DbQbeTest.php

Remove require of libraries included in test bootstrap

2016-01-12 16:43:16 +01:00

DbSearchTest.php

Fix markup and tests

2016-11-15 17:41:38 +01:00

DisplayResultsTest.php

Avoid double escaping of built in transformation URLs

2016-08-24 11:48:48 +02:00

ErrorHandlerTest.php

Add method to slice errors from the handler

2016-04-18 13:32:52 +02:00

ErrorTest.php

Strip path even if openbasedir restrictions apply

2016-08-18 10:16:39 +02:00

FileTest.php

Move the rest of the tests related to objects under a common parent test

2015-12-18 21:32:34 +11:00

FontTest.php

Move the rest of the tests related to objects under a common parent test

2015-12-18 21:32:34 +11:00

FooterTest.php

Add rel="noopener noreferrer" to all external target="_blank" links

2016-08-18 17:35:20 +02:00

HeaderTest.php

Load vendor_config just once at testsuite startup

2016-02-03 14:21:57 +01:00

IndexTest.php

Remove require of libraries included in test bootstrap

2016-01-12 16:43:16 +01:00

LanguageTest.php

Add test for getting MySQL locale

2016-01-13 08:51:56 +01:00

LinterTest.php

Move the rest of the tests related to objects under a common parent test

2015-12-18 21:32:34 +11:00

ListDatabaseTest.php

Move the rest of the tests related to objects under a common parent test

2015-12-18 21:32:34 +11:00

MenuTest.php

Load vendor_config just once at testsuite startup

2016-02-03 14:21:57 +01:00

MessageTest.php

Fix test failures with recent changes to Message class

2016-09-02 15:04:46 +02:00

PDFTest.php

Do not use global constant with class

2016-01-22 15:24:48 +01:00

ScriptsTest.php

Remove unsued code for generating events

2016-08-03 11:36:41 +02:00

ServerStatusDataTest.php

Remove require of libraries included in test bootstrap

2016-01-12 16:43:16 +01:00

StorageEngineTest.php

Remove require of libraries included in test bootstrap

2016-01-12 16:43:16 +01:00

SystemDatabaseTest.php

Move the rest of the tests related to objects under a common parent test

2015-12-18 21:32:34 +11:00

TableTest.php

Merge remote-tracking branch 'origin/pull/12564' into QA_4_6

2016-11-10 10:59:33 +01:00

TemplateTest.php

Remove trimming from template renderere

2016-05-12 15:35:38 +02:00

ThemeManagerTest.php

Fix tests for Table, ThemeManager, Tracker classes

2016-10-29 11:00:52 +05:30

ThemeTest.php

Remove require of libraries included in test bootstrap

2016-01-12 16:43:16 +01:00

TrackerTest.php

Fixed some more test errors

2016-11-05 09:49:55 +05:30

TypesMySQLTest.php

Remove require of libraries included in test bootstrap

2016-01-12 16:43:16 +01:00

TypesTest.php

Move the rest of the tests related to objects under a common parent test

2015-12-18 21:32:34 +11:00

UtilTest.php

Add missing variable

2016-04-20 10:13:39 +02:00

VersionInformationTest.php

Move the rest of the tests related to objects under a common parent test

2015-12-18 21:32:34 +11:00

ZipFileTest.php

Move the rest of the tests related to objects under a common parent test

2015-12-18 21:32:34 +11:00