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

682 Commits

Author SHA1 Message Date
Madhura Jayaratne
598f618427 Remove from metadata export until we find a way to align ids between them 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-23 19:27:45 +05:30
Madhura Jayaratne
7950b63ce0 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-23 19:26:28 +05:30
Madhura Jayaratne
3d3e0ece6c Avoid filling up error log with info level messages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-23 19:23:12 +05:30
Madhura Jayaratne
50d5db0643 Remove id field from some of the metadata 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-23 19:11:21 +05:30
Madhura Jayaratne
2693ad8699 Dump all metadata at the end 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-23 18:53:42 +05:30
Madhura Jayaratne
cacafa8e88 Use lower case names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 17:26:00 +05:30
Madhura Jayaratne
6b81b3925d align 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 15:37:03 +05:30
Madhura Jayaratne
2e48c6f1f5 Pass additional variables to input transformations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 15:33:04 +05:30
Madhura Jayaratne
946aa5c2d8 Input transformation ip to binary 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 15:14:24 +05:30
Madhura Jayaratne
0d109ac824 This is only a output transformation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 13:52:03 +05:30
Madhura Jayaratne
a8decb18db Adhere to coding style. Check for length of 4 first 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 14:41:46 +05:30
Madhura Jayaratne
bb8ca9eab5 Update description 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 14:35:13 +05:30
Madhura Jayaratne
a90fd8096a rfe #1655 Support IPv6 browser transformation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 14:33:56 +05:30
Madhura Jayaratne
15e5c3d9f7 Do not use globals 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-10 19:23:52 +05:30
Madhura Jayaratne
cb57dbb0ad Use object properties rather than using globals 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-10 17:46:54 +05:30
Madhura Jayaratne
04c39ebe30 Identify types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-10 17:36:11 +05:30
Madhura Jayaratne
ef981aa335 rfe #1632 Importing and exporting pMA meta-data 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-10 16:00:57 +05:30
Madhura Jayaratne
4bb1346913 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-09 21:01:09 +05:30
Madhura Jayaratne
be47fbac53 bug #4829 Create procedure via SQL Editor not more possible 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-09 20:56:57 +05:30
Michal Čihař
fd5cdbaab0 Merge commit '25a05bd6c81e0b938586e22e4a5eb229df99b01e' 2015-04-07 15:21:04 +02:00
Madhura Jayaratne
25a05bd6c8 MIME Transformation link fixed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-07 18:08:43 +05:30
Marc Delisle
1353a79720 Respect our message style (second attempt) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-03 05:47:10 -04:00
Marc Delisle
e54133575c Revert "Respect our message style" 
This reverts commit 5b768a115d.
 2015-04-03 05:43:23 -04:00
Marc Delisle
5b768a115d Respect our message style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-03 05:40:03 -04:00
Marc Delisle
ca652921bb Merge pull request #1627 from whitepiegon/masterFeature1 
feature 844 structure in PDF export
 2015-04-02 15:34:58 -04:00
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
1a2fee8fbb Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-02 11:06:48 +05:30
Madhura Jayaratne
57e21caab1 bug #4828 JavaScript is loaded in wrong order 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-02 11:01:23 +05:30
Marc Delisle
d230d78bb2 Merge commit 'e3735f9' 2015-03-30 08:33:29 -04:00
Madhura Jayaratne
4c0b0f9687 bug #4821 Timed-out import fails to restart when file represented 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-30 16:01:51 +05:30
Madhura Jayaratne
f70cda04e5 Merge branch 'QA_4_4' 2015-03-27 19:23:47 +05:30
Madhura Jayaratne
9c56ea6950 Make translatable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:20:16 +05:30
Madhura Jayaratne
050319f2e2 rfe #354 PDF schema sort options 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:16:49 +05:30
Marc Delisle
fa763b1828 Merge pull request #1579 from addaleax/json-pretty-print 
Add option for exporting pretty-printed JSON
 2015-03-25 07:40:36 -04:00
Madhura Jayaratne
dc4b9a628f Merge branch 'QA_4_3' into QA_4_4 2015-03-19 18:02:43 +05:30
Madhura Jayaratne
610e3c76a2 bug #4804 Undefined Index after export schema 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-19 17:59:02 +05:30
Marc Delisle
a278b809a3 Merge branch 'QA_4_3' into QA_4_4 2015-03-17 16:02:03 -04:00
Andrea Vallorani
364b26b0dd Bug #4798 Missing column when exporting in sql (2) 
Export failure when the comments contains reserved keywords (KEY, CONSTRAINT)
To resolve, I removed the SQL comment from the current line before checking the presence of reserved keywords.

Signed-off-by: Andrea Vallorani <andrea.vallorani@gmail.com>
 2015-03-17 18:15:13 +01:00
Madhura Jayaratne
9f1f0e6bc1 Per server iv 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-16 08:34:40 +05:30
Hauke Henningsen
b350af3c7f
Strip trailing spaces 
Signed-off-by: Hauke Henningsen <sqrt@entless.org>
 2015-03-16 03:29:49 +01:00
Hauke Henningsen
477bb0dc0c
Add option for exporting pretty-printed JSON 
This adds a single option to the JSON export plugin,
which, if available (PHP >= 5.4.0) corresponds to passing
`JSON_PRETTY_PRINT` to `json_encode`.

Signed-off-by: Hauke Henningsen <sqrt@entless.org>
 2015-03-16 03:22:56 +01:00
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
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