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

242 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
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
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
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
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
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
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
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
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
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
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
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
Madhura Jayaratne
aba1d92362 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 16:50:22 +05:30
Madhura Jayaratne
7de549b7f3 bug #4639 Export SQL missing indentation first field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 16:45:56 +05:30
Hugues Peccatte
e037f60015 Factorization. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-29 16:04:29 +01:00
Madhura Jayaratne
fec459c9ac rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-14 16:35:17 +05:30
Madhura Jayaratne
b6f0d923b2 More long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-11 18:01:58 +05:30
Nisarg Jhaveri
fb130bf20d Fixed typo in SQL export 
Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-11-11 00:47:38 +05:30
Hugues Peccatte
42e0bdd47a Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 18:32:42 +01:00
Hugues Peccatte
5e7fa3b821 Remove unused local variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:52:20 +01:00
Hugues Peccatte
74f0beda8f Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 20:56:12 +02:00
Marc Delisle
9680410019 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-19 10:13:07 -04:00
Marc Delisle
3ec96cb038 Remove unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-18 08:31:26 -04:00
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
Hugues Peccatte
70a21ec25c Merge from master. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-08 21:49:37 +02:00
Madhura Jayaratne
3ea2e7d81f rfe #3120 Events are not exported when using xml 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 18:30:10 +05:30
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Marc Delisle
cd2225c997 Merge branch 'QA_4_2' 2014-09-27 09:14:31 -04:00
Marc Delisle
deea8c6946 bug in PDF export: title not present in PDF 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-27 08:39:00 -04:00
Hugues Peccatte
fe452a7240 Make Scrutinizer happier. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 13:56:42 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Marc Delisle
31c1f6e70f Merge commit 'fed4664' 2014-08-28 12:36:53 -04:00
Smita Kumari
fed466498e update bug fix #4487 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-28 21:12:04 +05:30
Marc Delisle
8e9f1bec21 Merge commit '83e90ae' 2014-08-27 12:55:07 -04:00
Smita Kumari
83e90ae1a0 bug fix #4487 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-27 19:12:27 +05:30
Marc Delisle
70fbae31aa Merge commit '89d57f8' 2014-08-21 13:07:21 -04:00
Smita Kumari
89d57f8336 Fix bug #4518 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-21 21:39:11 +05:30
Marc Delisle
8537e1d966 Merge commit '5681db5' 2014-08-14 12:08:12 -04:00
Smita Kumari
5681db5084 fix bug #4516 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-14 20:55:02 +05:30
Ashutosh Dhundhara
508f0a752b RFE#919: Multiple-column foreign key relation. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix missing master column.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix function doc.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-01 19:50:12 +05:30
Ann + J.M
f5a9a60382 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-07-03 20:27:39 +02:00
Michal Čihař
dca981481d Remove plugin manager and observer classes 
We don't really need the observer pattern, so let's simplify the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-25 09:25:59 +02:00