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

786 Commits

Author SHA1 Message Date
Madhura Jayaratne
9cf71d9169 Fix #11394 Export/import Designer view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-13 10:17:24 +05:30
Marc Delisle
2bfe605384 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-12 15:41:16 -04:00
Marc Delisle
790671864b Merge pull request #11391 from madhuracj/issue11387 
Fix #11387 phpseclib < 2.0 produces deprecated messages on PHP
 2015-08-12 15:38:01 -04:00
Marc Delisle
5bf03ef3e7 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-12 15:26:17 -04:00
Madhura Jayaratne
6187066851 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-12 14:12:21 +05:30
Madhura Jayaratne
ea701dfcc1 Do not repeat the same conditions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-12 14:11:16 +05:30
Madhura Jayaratne
ea422a327e Fix #11387 phpseclib < 2.0 produces deprecated messages on PHP 
Update phpseclib to version 2.0.0

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-12 11:27:32 +05:30
Madhura Jayaratne
15204ab227 Fix #11389 ReCaptcha produce deprecated messages under PHP 7 
Upgrade ReCaptcha library to version 1.1.1

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-12 09:49:22 +05:30
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
Madhura Jayaratne
ca1c424e9d Add missing docs for parameters 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 12:24:31 +05:30
Hugues Peccatte
9b0e7652a5 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-10 22:22:51 +02:00
Hugues Peccatte
2f7aecc12a Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-10 21:27:51 +02:00
Sebastian Ott
e29119cb64 Improved schema svg export 
Signed-off-by: Sebastian Ott <sebastian@it-ott.de>
 2015-08-10 09:09:43 -04:00
Marc Delisle
23aecf5123 Merge branch 'QA_4_4' 2015-08-08 12:17:08 -04:00
Marc Delisle
fafa03f9af Revert "Handle comments in the beginning of the query" 
This reverts commit 55a2d06cca.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-08 12:15:16 -04:00
Marc Delisle
ad5baa88e9 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-06 18:00:16 -04:00
Marc Delisle
c3c196cad8 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-06 14:49:17 -04:00
Marc Delisle
bcb699f72d Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-06 14:01:42 -04:00
Marc Delisle
36ba14ad8e Make scrutinizer happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-03 16:04:58 -04:00
Marc Delisle
0e4f2ce7a8 Merge commit 'b1d567d' 2015-08-02 10:28:36 -04:00
Marc Delisle
b1d567dd54 Merge pull request #11342 from nisargjhaveri/issue_11339 
Handle comments in the beginning of the query
 2015-08-02 10:26:33 -04:00
Nisarg Jhaveri
55a2d06cca Handle comments in the beginning of the query 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-08-02 18:42:37 +05:30
Madhura Jayaratne
35d36f966d Revert "Support alias" 
This reverts commit 2cfaf8f411.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 14:08:10 +05:30
Madhura Jayaratne
2cfaf8f411 Support alias 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 12:54:51 +05:30
Madhura Jayaratne
8ebb632bc2 Merge branch 'QA_4_4' 2015-07-31 12:42:54 +05:30
Madhura Jayaratne
eea2bf811a Fix #11336 Exporting a table exports database level events 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 12:36:53 +05:30
Madhura Jayaratne
9a8e8e60c8 Fix #11328 Exporting table generates AUTO_INCREMENT=; for new tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-28 16:13:42 +05:30
Madhura Jayaratne
75cf9e7d59 Merge branch 'QA_4_4' 2015-07-28 08:17:42 +05:30
Madhura Jayaratne
7c1c639ef4 Fix #11326 Exported schema includes all the tables of the database 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-28 08:11:38 +05:30
Dan Ungureanu
4a0ab124f7 Fixed visibility. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:34 +03:00
Dan Ungureanu
796fb97cbe Fixed visibility. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:34 +03:00
Dan Ungureanu
cb9cc68fe9 Fixed more issues. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:33 +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
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
9081580c63 Remove extra new line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:23:27 +05:30
Madhura Jayaratne
b065dede6d Merge branch 'QA_4_4' 2015-07-14 14:57:23 +05:30
Madhura Jayaratne
e4de638bbd Only the empty repeats in the last column should be skipped 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-14 14:55:01 +05:30
Madhura Jayaratne
6cd73329a6 Merge branch 'QA_4_4' 2015-07-14 14:27:02 +05:30
Madhura Jayaratne
9614518999 bug #4979 Problem when import *.ods file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-14 14:25:19 +05:30
Dan Ungureanu
deada65601 Fixed exporting issues related to views. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-11 19:14:22 +03:00
Dan Ungureanu
fd1dc6d6ec Fixed wrong variable name. 
Updated sql-parser library to udan11/sql-parser@140040f.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-11 03:37:25 +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
8a5e8a275a Using the new parser when generating a table's definition. 
Fixed a small bug regarding an undefined variable.
Updated sql-parser library to udan11/sql-parser@30fdd07.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:19 +03:00
Dan Ungureanu
19cdd09c08 Removed dead code. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:18 +03:00
Dan Ungureanu
c123e0f7b4 Replaced the old parser in utilities. 
Updated sql-parser library to udan11/sql-parser@9478c9a.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:18 +03:00
Dan Ungureanu
fc6212b922 Improved documentation. 
Updated sql-parser library to udan11/sql-parser@0bff48a.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:18 +03:00
Dan Ungureanu
51876a097c Coding style fixes. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:17 +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
Dan Ungureanu
c34cf9ff29 More refactoring. 
Updated sql-parser library.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:16 +03:00