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

904 Commits

Author SHA1 Message Date
Madhura Jayaratne
6d682dc48f Merge branch 'QA_4_3' 2014-12-24 12:08:32 +05:30
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
Marc Delisle
371780a0a1 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-23 11:32:10 -05:00
Madhura Jayaratne
f6b7f98322 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-23 10:43:54 -05:00
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
944bc3abad Merge branch 'QA_4_3' 2014-12-20 13:33:43 -05:00
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
Marc Delisle
f136eaeb18 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-17 13:58:25 -05:00
Marc Delisle
0a2fd56c49 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-17 13:46:43 -05:00
Marc Delisle
ee960768ca Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-17 13:26:54 -05:00
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
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
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
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
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
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
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
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
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