Commit Graph

2150 Commits

Author SHA1 Message Date
Madhura Jayaratne
36cb10bd77 Update another test case
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-14 21:05:19 +05:30
Madhura Jayaratne
8cdaf81e27 bug #4702 URL is non RFC-2396 compatible in get_scripts.js.php
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-14 20:56:22 +05:30
Madhura Jayaratne
00c7e891e1 Properly implement 'TableNavigationLinksMode' configuration
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-12 10:34:37 +05:30
Madhura Jayaratne
eee442e4a7 Update another tracking query and its corresponding unit test
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-02 10:27:47 +05:30
Madhura Jayaratne
09fff10681 Fix tracking query and related test
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-02 10:21:10 +05:30
Madhura Jayaratne
d8bea6fcbe Fix a failing test
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-02 10:04:50 +05:30
Madhura Jayaratne
e75d4ec8b4 Merge branch 'QA_4_3' into zeroconf
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-02 09:57:25 +05:30
Madhura Jayaratne
dfae4d2f08 Bug #4676 - Auto configuration issues
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-02 09:49:03 +05:30
Madhura Jayaratne
f61cf81de4 Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-31 16:19:34 +05:30
Marc Delisle
38bb19ffb6 bug #4655 Undefined index: collation_connection
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-26 08:29:09 -05:00
Madhura Jayaratne
aaa6b9d4d9 Merge branch 'QA_4_3' into Bug4642
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-24 12:03:25 +05:30
Madhura Jayaratne
48570a6dbd Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-24 10:25:21 +05:30
Marc Delisle
ac6657c1fd Merge pull request #1435 from madhuracj/Bug4663
#4663 Export missing back ticks for order table name
2014-12-23 08:02:04 -05:00
Madhura Jayaratne
c445794bde bug #4666 Undefined indexes in table stucture print view of a view
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-23 16:50:47 +05:30
Madhura Jayaratne
0430ac6337 #4663 Export missing back ticks for order table name
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-23 12:53:12 +05:30
Marc Delisle
5429d91ce1 bug ['Error_Handler']['display'] no longer necessary
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-20 13:32:34 -05:00
Madhura Jayaratne
aca78cb688 Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-15 18:53:01 +05:30
Madhura Jayaratne
33c819b8b4 Remove token from JS file requests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-15 13:13:52 +05:30
Madhura Jayaratne
9f58a8188a Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-10 15:07:17 +05:30
Madhura Jayaratne
093be4b1ee Fix tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-09 16:45:23 +05:30
Madhura Jayaratne
5233ee8bb1 Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-08 18:07:58 +05:30
Chirayu Chiripal
94a94c05c1 fix tests for HHVM
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-12-07 13:52:56 +05:30
Hugues Peccatte
5d911e902d Fix unit test.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-12-06 22:15:23 +01:00
Hugues Peccatte
3f16b312e1 Fix unit test.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-12-06 14:02:27 +01:00
Hugues Peccatte
f5af9d7123 Fix unit test.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-12-06 14:02:26 +01:00
Hugues Peccatte
fc2498361b Add unit test for PMA_Menu::setTable().
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-12-06 14:02:26 +01:00
Marc Delisle
00db138a47 bug #4620 Undefined index while adding to the central columns list
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-04 14:01:52 -05:00
Michal Čihař
680352b372 Merge branch 'MAINT_4_3_0' into QA_4_3
Conflicts:
	README
	doc/conf.py
	libraries/Config.class.php
2014-12-04 09:14:02 +01:00
Michal Čihař
ccc239040f Adjust testcase to new split methods
Signed-off-by: Michal Čihař <michal@cihar.com>

Conflicts:
	test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
2014-12-04 09:12:48 +01:00
Michal Čihař
f9dc6be7e6 Add missing call to test
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-12-04 09:12:05 +01:00
Marc Delisle
41c02abc41 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-03 09:02:25 -05:00
Marc Delisle
20d0f08c58 Deactivate this test for now
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-03 09:00:45 -05:00
Madhura Jayaratne
b92d3e1047 Workaround for token mismatch error on server session timeout for config and http authentication types
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-28 10:56:28 +05:30
Ann + J.M
f14a051e1b [TEST] Fix failing test after 3d87430
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-11-27 16:38:50 +01:00
Michal Čihař
c11efb678d This is binary string, can not use mb_strlen
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-11-20 10:28:53 +01:00
Robert Scheck
491c426623 Patch by Robert Scheck <robert@fedoraproject.org> for phpMyAdmin 4.2.6
which enhances cookie encryption/decryption by the optional usage of
PHP OpenSSL. Unfortunately PHP Mcrypt is not shipped by all Linux
distributions however PHP OpenSSL is often enabled by default.
PHP < 5.3.4 does not support passing an IV, thus this has been added as
a requirement. I could have used 'BF-CBC' rather 'AES-128-CBC' but Blowfish
(even it is fast) is seen by experts as weaker algorithm than
AES. If this should be a show-stopper for upstream merging just replace
'AES-128-CBC' by 'BF-CBC', please.

Patch adapted for 4.3.x and tests modified by Marc Delisle

Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-19 07:38:32 -05:00
Madhura Jayaratne
3e1455a5db Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-13 14:02:08 +05:30
Hugues Peccatte
a68ea85d4d Remove unused locale variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-10 23:26:57 +01:00
Hugues Peccatte
8e6d16cf7e Merge pull request #1389 from Tithugues/replicationInfo_master
Use $replication_info everywhere, instead of $server_* variables.
2014-11-10 13:45:39 +01:00
Madhura Jayaratne
686924d628 Update doc comment
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-10 12:29:53 +05:30
Madhura Jayaratne
dfea0a4fa0 Fix footer test
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-10 12:27:04 +05:30
Madhura Jayaratne
5c739d6c2d Define variables needed for testing
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-10 06:20:18 +05:30
Hugues Peccatte
19cb4a7eb9 Fix PHPDoc for provider.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-09 18:59:51 +01:00
Hugues Peccatte
4922230bb6 Add test for PMA_StorageEngine::getEngine.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-09 17:22:26 +01:00
Hugues Peccatte
49836e6e6f Use $replication_info everywhere, instead of $server_* variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-09 16:30:07 +01:00
Hugues Peccatte
93c86da700 Minor style modifications.
PHPDoc update.
Reduce nested levels.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-08 17:34:10 +01:00
Marc Delisle
065397cd84 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-08 06:48:56 -05:00
Marc Delisle
1ed62c3fca bug Incorrect text/icon display in Tracking report
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-08 06:46:25 -05:00
Madhura Jayaratne
09fa8dc860 Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-06 13:41:36 -08:00
Michal Čihař
a5337bf0ea Set timezone in PHP snippet
There is no clean way to adjust HHVM settings from Travis, see
https://github.com/travis-ci/travis-ci/issues/2523

Caused by HHVM configuration no longer including timezone settings, see
https://github.com/travis-ci/travis-ci/issues/2812

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-11-03 10:40:43 +01:00