gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,395 Commits 12 Branches 481 Tags 2.4 GiB
390796c01e
Commit Graph

640 Commits

Author SHA1 Message Date
Madhura Jayaratne
9bf5792dc0 Merge branch 'QA_4_3' into QA_4_4 2015-03-09 14:48:43 +05:30
Madhura Jayaratne
7dde05cc41 phpUnit is unable to mock private methods 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 14:17:15 +05:30
Madhura Jayaratne
df39cff9ef Return value from the new method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 13:53:12 +05:30
Madhura Jayaratne
42bbc5e04d bug #4758 Firefox with auth_type to http with multiple server doesn't work anymore 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 13:24:28 +05:30
Marc Delisle
ff35677c26 Merge pull request #1523 from madhuracj/rfe1602 
Alternative implementation for rfe #1602
 2015-03-01 06:33:41 -05:00
Marc Delisle
f5a9002209 Merge pull request #1520 from madhuracj/rfe1441 
rfe #1441 Add regexp match when using AllowArbitraryServer
 2015-02-28 06:17:36 -05:00
Michal Čihař
a6713cf771 First resolve method name and then use it 
Otherwise this fails with PHP 7 (-> is evaluated before [], so we're
dereferencing object by array).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-02-27 14:25:54 +01:00
Madhura Jayaratne
1b939fb3d3 rfe #1441 Add regexp match when using AllowArbitraryServer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-26 17:02:09 +05:30
Madhura Jayaratne
e506afc3b0 Revert "Save unfinished work" 
This reverts commit 3007c6a6ef.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-26 11:53:48 +05:30
Hugues Peccatte
05ebf9a3a7 Fix typos. 
Minor PHPDoc update.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-22 22:54:09 +01:00
Marc Delisle
3e8ed57470 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 07:52:26 -05:00
Madhura Jayaratne
85aa480be7 Remove transformation related code from makegrid.js and functions.js 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 12:53:54 +05:30
Madhura Jayaratne
805679626a rfe #685 Editor for HTML content 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 12:41:56 +05:30
Madhura Jayaratne
de8da9da5f More sub package corrections 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 11:16:47 +05:30
Madhura Jayaratne
e262ca22a2 Use proper sub packages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 11:15:18 +05:30
Madhura Jayaratne
06a95a425c Escape special chars 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 10:56:55 +05:30
Madhura Jayaratne
b7b865a248 Simplify editors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 10:41:49 +05:30
Madhura Jayaratne
f334064cc4 Add javascript mode file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-19 13:58:49 +05:30
Madhura Jayaratne
3d3c672545 rfe #1275 CodeMirror based JSON editor as an input transformation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-19 13:54:57 +05:30
Madhura Jayaratne
6ee59b7eec rfe CodeMirror based SQL editor as an input transformation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-19 13:20:32 +05:30
Zhang Hao
3007c6a6ef Save unfinished work 
Signed-off-by: Zhang Hao <jason.daurus@gmail.com>
 2015-02-13 18:46:09 +08:00
Hugues Peccatte
5837dba61a Remove unused return. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-08 16:34:51 +01:00
Madhura Jayaratne
6f9367b165 rfe #1192 ON DUPLICATE KEY UPDATE for loading CSV 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-06 14:54:34 +05:30
Madhura Jayaratne
1006aedb28 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-04 15:17:55 +05:30
Madhura Jayaratne
677da2906c bug #4706 Schema export doesn't handle dots in db/table name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-04 15:11:05 +05:30
Madhura Jayaratne
77d66242e4 Transformation for JSON 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-02 17:51:23 +05:30
Marc Delisle
be03cb3f27 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-02 06:25:37 +01:00
Madhura Jayaratne
4d6c6e53ac rfe #719 more details in PDF relation view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-30 10:03:12 +05:30
Madhura Jayaratne
19acb28444 Browser transformation and links for mysql and information_schema 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-26 11:56:51 +05:30
Marc Delisle
4458426aa7 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-22 16:01:32 -05:00
Madhura Jayaratne
aea519fded bug #4707 Call to undefined method PMA_Schema_PDF::dieSchema() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-14 19:30:00 +05:30
Madhura Jayaratne
b1056fc7d4 diagram variable does not have a method dieSchema() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 19:08:36 +05:30
Madhura Jayaratne
baa92b32f3 Revert "Remove more dead code" 
This reverts commit c1e220520e.
 2015-01-13 18:51:21 +05:30
Madhura Jayaratne
c1e220520e Remove more dead code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 18:18:11 +05:30
Madhura Jayaratne
c895b6147b Remove dead code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 18:10:10 +05:30
Madhura Jayaratne
a3477de69a Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 18:07:55 +05:30
Madhura Jayaratne
9524db89ce bug #4703 Unsaved schema page exported as pdf.pdf 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 18:00:13 +05:30
Madhura Jayaratne
3535ba8578 Fix comments for auto_increment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-09 13:15:49 +05:30
Madhura Jayaratne
373fc4f74c Indent foreign keys 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-09 12:55:15 +05:30
Madhura Jayaratne
d345556888 rfe #1525 Generate keys one per line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-09 12:54:38 +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
Hugues Peccatte
763707a72e Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-04 15:19:09 +01:00
Marc Delisle
6eb92ff103 Merge commit 'fc6be4a' 2015-01-04 07:11:47 -05:00
Hugues Peccatte
561ec7ea30 Remove code to ignore commit. 
Fix comment.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 21:39:56 +01:00
Hugues Peccatte
4330110c90 Revert "Fix #4645 Import of export created with mysqldump" 
This reverts commit 2dcb1c9b0a.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 19:53:09 +01:00
Marc Delisle
1c1c313d76 Merge branch 'QA_4_3' 2014-12-24 06:41:47 -05:00
Marc Delisle
77fec70ee8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-24 06:40:18 -05:00
Madhura Jayaratne
e16ad76ebd Merge branch 'QA_4_3' 2014-12-24 11:55:32 +05:30
Madhura Jayaratne
32f1ac4211 bug #4670 CSV import reads both commas and values into first column after first row 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 11:52:20 +05:30
Madhura Jayaratne
f6b7f98322 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-23 10:43:54 -05:00