Marc Delisle f447cd94b0 Fix merge conflict ...

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

2015-09-08 11:35:05 -04:00

..

_data

Fix typos.

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

config

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

controllers

Fix syntax error.

2015-08-25 16:32:37 +02:00

dbi

Removed the old parser.

2015-07-10 23:18:18 +03:00

gis

Added tests for sql.lib.php and parse_analyze.inc.php.

2015-07-25 19:39:33 +03:00

navigation

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

plugin

Fix merge conflict

2015-09-08 11:35:05 -04:00

properties

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

schema

Fix typo.

2015-07-21 00:08:26 +02:00

PMA_Advisor_test.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

PMA_Config_test.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

PMA_DatabaseInterface_test.php

Make PHPcs happy.

2015-05-23 00:43:18 +02:00

PMA_DBQbe_test.php

Removed the old parser.

2015-07-10 23:18:18 +03:00

PMA_DbSearch_test.php

Update tests with sentence case

2015-08-26 17:35:50 +10:00

PMA_DisplayResults_test.php

Refactored Table.class.php.

2015-07-10 23:18:16 +03:00

PMA_Error_Handler_test.php

bug ['Error_Handler']['display'] no longer necessary

2014-12-20 13:32:34 -05:00

PMA_Error_test.php

Fix typos.

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

PMA_File_test.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

PMA_Font_test.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

PMA_Footer_test.php

Add some unit tests

2015-06-30 01:29:36 +05:30

PMA_Header_test.php

Revert "The DisableIS directive is removed"

2014-10-09 18:29:55 +05:30

PMA_Index_test.php

Fix tests

2015-01-28 17:15:19 +05:30

PMA_List_Database_test.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

PMA_Menu_test.php

Replace script names as config options with plain english words

2015-06-13 04:41:54 +05:30

PMA_Message_test.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

PMA_PDF_test.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

PMA_Scripts_test.php

Avoid caching JS and CSS files across phpMyAdmin versions

2015-07-27 21:52:20 +05:30

PMA_ServerStatusData_test.php

Use $replication_info everywhere, instead of $server_* variables.

2014-11-09 16:30:07 +01:00

PMA_StorageEngine_test.php

Share code for rendering storage engine subpages

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

PMA_SystemDatabase_test.php

Add PMA_VERSION to fix failing tests

2015-07-17 11:28:34 +05:30

PMA_Table_test.php

Make PHPCS happy.

2015-08-25 16:20:31 +02:00

PMA_Template_test.php

Make PHPcs happy.

2015-05-23 01:21:30 +02:00

PMA_Theme_Manager_test.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

PMA_Theme_test.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

PMA_Types_Drizzle_test.php

Remove trailing white spaces

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

PMA_Types_MySQL_test.php

Feature request 1675: MySQL and MariaDB functions INET6_ATON and INET6_NTOA

2015-05-31 09:48:20 -04:00

PMA_Types_test.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

PMA_Util_test.php

More refactoring.

2015-07-10 23:18:16 +03:00