Marc Delisle 1347aa60e3 Fix merge conflict ...

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

2014-09-21 09:16:50 -04:00

..

_data

…

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

Coding style modifications.

2014-08-09 23:11:36 +02:00

navigation

Add test for NavigationTree::renderPath

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

plugin

No need to have a distinct file

2014-09-06 14:11:04 -04:00

properties

…

schema

Fix more failing tests

2014-08-24 21:56:35 +05:30

PMA_Advisor_test.php

Revert 33a30ad7ae. Those funcitons are infact used.

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

PMA_Config_test.php

Mass modifications to use PMA_String.

2014-09-06 10:44:03 +02:00

PMA_DBQbe_test.php

Bug#4511: QBE fails to generate LEFT join for InnoDB foreign keys in absence of configuration storage.

2014-08-11 03:58:19 +05:30

PMA_DbSearch_test.php

RFE#919: Multiple-column foreign key relation.

2014-08-01 19:50:12 +05:30

PMA_DisplayResults_test.php

Remove unsed variable

2014-09-17 00:21:10 +05:30

PMA_Error_Handler_test.php

Fix failing existing PHPUnit tests.

2014-06-16 11:50:53 +05:30

PMA_Error_test.php

Coding style modifications.

2014-08-09 23:21:13 +02:00

PMA_File_test.php

Move hex encoding back to getContent method

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

PMA_Font_test.php

…

PMA_Footer_test.php

…

PMA_Header_test.php

PMA console, history and bookmarks.

2014-06-25 21:22:33 +08:00

PMA_Index_test.php

…

PMA_List_Database_test.php

…

PMA_Menu_test.php

…

PMA_Message_test.php

Revert "Fix failing tests"

2014-06-24 09:35:35 +02:00

PMA_PDF_test.php

…

PMA_Scripts_test.php

Coding style modifications.

2014-09-14 15:47:14 +02:00

PMA_ServerStatusData_test.php

RFE-1490 Dynamic process list

2014-06-24 19:13:21 +05:30

PMA_StorageEngine_test.php

Share code for rendering storage engine subpages

2014-06-06 14:59:22 +02:00

PMA_Table_test.php

Correct value for a parameter

2014-06-24 09:51:14 +02:00

PMA_TableReplaceSearch_test.php

Fix coding style

2014-08-16 08:44:40 -04:00

PMA_TableSearch_test.php

feature 857: Regex search and replace

2014-08-15 18:26:31 +05:30

PMA_Theme_Manager_test.php

…

PMA_Theme_test.php

bug #4361 Can't change font size (when config.inc.php not present)

2014-09-21 09:13:18 -04:00

PMA_Types_Drizzle_test.php

…

PMA_Types_MySQL_test.php

…

PMA_Types_test.php

…

PMA_Util_test.php

Fix coding style

2014-08-22 12:45:41 -04:00