Marc Delisle 9373e1b204 Fix merge conflict ...

Signed-off-by: Marc Delisle <marc@infomarc.info>

2014-05-23 10:21:37 -04:00

..

_data

Add missing package names

2012-08-31 20:45:53 +05:30

config

Code style fixes

2014-05-21 20:56:01 +02:00

dbi

The storeResult needs mysqli lin parameter to operate

2014-05-09 16:29:56 +02:00

gis

Fix typo in type name

2014-05-08 18:04:07 +02:00

navigation

Add test for NavigationTree::renderPath

2014-05-10 12:48:16 +02:00

plugin

Merge commit '0ee881d'

2014-05-16 12:20:52 -04:00

properties

Use stable sort for removeProperty of OptionsPropertyGroup.

2014-02-12 03:07:27 +00:00

schema

Move slow tests in HHVM to group medium

2014-03-13 05:20:31 +00:00

PMA_Advisor_test.php

Revert 33a30ad7ae. Those funcitons are infact used.

2014-05-10 12:04:36 +02:00

PMA_Config_test.php

Adjust expectations

2014-05-06 14:32:56 +02:00

PMA_DBQbe_test.php

Remove trailing white spaces

2013-11-03 19:13:23 +05:30

PMA_DbSearch_test.php

PHPCS updates.

2014-03-15 12:29:31 +01:00

PMA_DisplayResults_test.php

Fix merge conflict

2014-05-23 10:21:37 -04:00

PMA_Error_Handler_test.php

Import dependencies to make unit tests friendlier to running independently

2014-03-10 03:26:24 +00:00

PMA_Error_test.php

Import dependencies to make unit tests friendlier to running independently

2014-03-10 03:26:24 +00:00

PMA_File_test.php

Move hex encoding back to getContent method

2014-05-08 15:17:55 +02:00

PMA_Font_test.php

Remove trailing whitespace from the code

2014-03-20 09:36:48 +01:00

PMA_Footer_test.php

Move slow tests in HHVM to group medium

2014-03-13 05:20:31 +00:00

PMA_Header_test.php

Remove incomplete @covers annotations

2014-03-19 16:04:20 +01:00

PMA_Index_test.php

Make unit tests friendlier to running independently

2013-11-20 14:43:55 -08:00

PMA_List_Database_test.php

Drop List::getSingleItem as it is not used

2014-03-14 07:29:15 +01:00

PMA_Menu_test.php

Import dependencies to make unit tests friendlier to running independently

2014-03-10 03:26:24 +00:00

PMA_Message_test.php

Fix for bug#4237.

2014-02-07 11:56:46 +05:30

PMA_PDF_test.php

Remove trailing white spaces

2013-11-03 19:13:23 +05:30

PMA_Scripts_test.php

Honor URL separator in get_scripts parameters

2014-02-27 09:12:49 +01:00

PMA_StorageEngine_test.php

Import dependencies to make unit tests friendlier to running independently

2014-03-09 08:16:24 +00:00

PMA_Table_test.php

Fix typo in type name

2014-05-08 18:04:07 +02:00

PMA_TableReplaceSearch_test.php

Move slow tests in HHVM to group medium

2014-03-13 05:20:31 +00:00

PMA_TableSearch_test.php

Move slow tests in HHVM to group medium

2014-03-13 05:20:31 +00:00

PMA_Theme_Manager_test.php

Remove trailing white spaces

2013-11-03 19:13:23 +05:30

PMA_Theme_test.php

Remove incomplete @covers annotations

2014-03-19 16:04:20 +01:00

PMA_Types_Drizzle_test.php

Remove trailing white spaces

2013-11-03 19:13:23 +05:30

PMA_Types_MySQL_test.php

Support AES_DECRYPT as well

2014-03-25 13:59:29 +01:00

PMA_Types_test.php

Add missing operator to test

2012-10-16 16:23:09 +02:00

PMA_Util_test.php

Import dependencies to make unit tests friendlier to running independently

2014-03-10 03:26:24 +00:00