gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,481 Commits 12 Branches 481 Tags 2.4 GiB
3d5008a05c
Commit Graph

883 Commits

Author SHA1 Message Date
Hugues Peccatte
b5118010c7 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 22:14:35 +01:00
Hugues Peccatte
ef450c156a Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 22:13:53 +01:00
Hugues Peccatte
d4262e5678 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 13:11:20 +01:00
Hugues Peccatte
5c3b76a374 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 12:58:55 +01:00
Hugues Peccatte
3e0796a928 Add unit test for PMA_Menu::setTable(). 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 08:54:49 +01:00
Ann + J.M
9d13de4ead Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-12-02 20:10:55 +01:00
Madhura Jayaratne
f9e430e0d3 Merge branch 'master' into multiquery 2014-12-01 16:51:48 +05:30
Michal Čihař
2502375982 Add missing call to test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 11:56:19 +01:00
Michal Čihař
baa922e902 Define missing variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 10:43:03 +01:00
Michal Čihař
94baaba666 Adjust testcase to new split methods 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 10:42:11 +01:00
Madhura Jayaratne
65794575a0 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 10:07:28 +05:30
Ann + J.M
b23a40f39c Merge branch 'QA_4_3' 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-11-27 16:49:06 +01:00
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
Marc Delisle
6f8a253daf Merge pull request #1407 from madhuracj/tokenMismatch 
Workaround for token mismatch error on server session timeout for config and http authentication types
 2014-11-26 07:42:46 -05:00
Madhura Jayaratne
783cacbd1e 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-20 17:37:39 +05:30
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
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
Madhura Jayaratne
09fa8dc860 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-06 13:41:36 -08:00
Hugues Peccatte
42e0bdd47a Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 18:32:42 +01:00
Hugues Peccatte
eea3332acf Remove unused parameters. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 17:49:22 +01:00
Hugues Peccatte
dc4b7fc239 Minor test update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 16:07:12 +01:00
Hugues Peccatte
037a034b43 Minor coding style modifications. 
Fix typos.
PHPDoc and JSDoc updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:04:35 +01:00
Hugues Peccatte
e17de11c74 Improve multibytes string manipulation performances. 
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 17:40:09 +01:00
Marc Delisle
90ee48f0ba Merge pull request #1384 from phpmyadmin/ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style 
RFE 1550: PMA_URL_getCommon(): new style
 2014-10-28 08:14:45 -04:00
Marc Delisle
5d62fcbf78 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-27 15:01:29 -04:00
Marc Delisle
e7598d7cc9 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-27 12:57:35 -04:00
Hugues Peccatte
80869ba0ec Merge branch 'master' into stringFunctions_useStandardFunctions_master 2014-10-25 17:08:48 +02:00
Ann + J.M
953e865fc6 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 20:44:50 +02:00
Ann + J.M
6feb3b0d3a Fix failing unit tests 
Signed-off-by: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 20:06:14 +02:00
Ann + J.M
29ec69c849 Merge branch 'master' into ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 16:58:00 +02:00
Hugues Peccatte
74f0beda8f Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 20:56:12 +02:00
Madhura Jayaratne
8785ea0e34 Adjust tests for commit 3ec96cb038 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-19 08:22:06 +05:30
Ann + J.M
b1a7039ae3 Convert PMA_URL_getCommon calls to new style 
Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:29 +02:00
Madhura Jayaratne
aaa2116b01 Fix some of the failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-18 21:59:33 +05:30
Marc Delisle
bc7d57f613 The minimum supported MySQL version is 5.5 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-16 13:32:15 -04:00
Madhura Jayaratne
771847102f SHOW GRANTS based privilege checking 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-15 10:55:33 +05:30
Madhura Jayaratne
98ea25d9ea Additional unit tests for new execution paths 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-14 18:51:12 +05:30
Madhura Jayaratne
c925d46f92 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-14 15:21:15 +05:30
Madhura Jayaratne
b587d7cd3d Fix more failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 07:18:11 +05:30
Madhura Jayaratne
d441a217ec Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:56:49 +05:30
Madhura Jayaratne
62b15dc2f6 Revert "The DisableIS directive is being deprecated" 
This reverts commit 8fd0d79405.

Conflicts:
	libraries/navigation/Nodes/Node.class.php
	test/classes/navigation/PMA_Node_test.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:31:33 +05:30
Madhura Jayaratne
603b31d023 Revert "The DisableIS directive is being deprecated" 
This reverts commit 57ef25eed8.

Conflicts:
	test/classes/plugin/export/PMA_ExportSql_test.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:30:16 +05:30
Madhura Jayaratne
3ac46455cf Revert "The DisableIS directive is removed" 
This reverts commit d8fd82a9f5.

Conflicts:
	ChangeLog
	doc/config.rst
	libraries/config.default.php
	libraries/config/messages.inc.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:29:55 +05:30