gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,773 Commits 12 Branches 481 Tags 2.4 GiB
04023ab6a2
Commit Graph

209 Commits

Author SHA1 Message Date
Dan Ungureanu
762d67dc36 Rewrote a part of the import mechanism. 
Updated sql-parser library to udan11/sql-parser@e713c9fa1d.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-11 23:32:18 +03:00
Marc Delisle
c3c196cad8 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-06 14:49:17 -04:00
Madhura Jayaratne
e9dfc964e3 Merge branch 'QA_4_4' 2015-07-31 14:17:46 +05:30
Madhura Jayaratne
199e8d2544 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 14:14:33 +05:30
Dan Ungureanu
f539a7398b Fix failing test. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-28 22:49:38 +03:00
Jason
6fd29078b6 Fix test failures 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:46:40 +08:00
Jason
6636153071 Resolve conflicts from upstream 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Madhura Jayaratne
473d9ba54a For tests MySQL version is defined as 5.50. So document links will get point to the latest, which is 5.7 now 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-20 09:54:02 +05:30
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Madhura Jayaratne
06ee23ed26 Add PMA_VERSION to fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 11:28:34 +05:30
Dan Ungureanu
053f7fc2e9 Fixed test. 2015-07-12 00:49:49 +03:00
Dan Ungureanu
5fa3bdf0d1 Restore SQL mode after export with certain configuration has finished. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-11 00:42:16 +03:00
Dan Ungureanu
ecc60f3664 Fixed failing tests. Also, removed deprecated PHPUnit configuration that might cause issues with XDebug. 
Fixed a bug where the query delimiter would not be added.
Updated sql-parser to udan11/sql-parser@7c925b6.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:18 +03:00
Dan Ungureanu
ae733edf41 Removed the old parser. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:18 +03:00
Dan Ungureanu
d4cbb51d04 Using the new parser for replacing aliases for export. 
Updated sql-parser library to udan11/sql-parser@2833495.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:17 +03:00
Madhura Jayaratne
dadecaf393 Match the name of corresponding config value. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-30 15:16:42 +05:30
Deven Bansod
edad7fcb3c Replace script names as config options with plain english words 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-13 04:41:54 +05:30
Madhura Jayaratne
375d34157b Merge branch 'QA_4_4' 2015-05-29 15:46:39 +05:30
Madhura Jayaratne
6a6ed5d5dc Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-29 15:45:27 +05:30
Marc Delisle
bd7cd9ab9c Merge branch 'QA_4_4' 2015-05-05 10:04:37 -04:00
Marc Delisle
d3338edf87 phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-05 10:04:11 -04:00
Marc Delisle
069a2a09e7 phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-05 09:18:18 -04:00
Marc Delisle
e4a9d114b6 Fix unit test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-01 08:02:22 -04:00
Madhura Jayaratne
f344c26138 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 15:43:15 +05:30
Madhura Jayaratne
33c4f54618 Fix unit tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 15:05:17 +05:30
Madhura Jayaratne
2b1b872f63 Fix SQL export related tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-10 16:45:04 +05:30
Aayush Anand
4b9ef9a757 feature 844 structure in PDF export squashed 
Signed-off-by: Aayush Anand <aayushism12@gmail.com>
 2015-04-03 00:51:33 +05:30
Madhura Jayaratne
9f1f0e6bc1 Per server iv 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-16 08:34:40 +05:30
Madhura Jayaratne
d162f4f3bd Per server iv 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 15:32:46 +05:30
Madhura Jayaratne
9bf5792dc0 Merge branch 'QA_4_3' into QA_4_4 2015-03-09 14:48:43 +05:30
Madhura Jayaratne
1f630a1a97 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 14:02:34 +05:30
Madhura Jayaratne
6a9b787320 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-19 14:14:45 +05:30
Madhura Jayaratne
9e26714239 Fix failing test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-09 21:32:03 +05:30
Madhura Jayaratne
743a528835 rfe #1590 Recaptcha API v2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-08 15:49:24 +05:30
Marc Delisle
4e8737ff2c Merge branch 'QA_4_3' 2014-12-26 08:29:32 -05:00
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
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
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
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
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
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