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

15002 Commits

Author SHA1 Message Date
Marc Delisle
e4e991d3fc Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-09 21:10:28 -04:00
Marc Delisle
9b85cdbbd4 Merge pull request #11552 from madhuracj/cookie 
Fix #11551 Fatal error when switched to master from QA_4_5
 2015-10-09 21:05:58 -04:00
Madhura Jayaratne
05c22016ee Fix cookies clearing on version change 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-10 08:26:40 +11:00
Hugues Peccatte
3cd139f163 Remove useless 'use'. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-09 22:15:55 +02:00
Marc Delisle
7311d59fa9 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-09 15:12:45 -04:00
Madhura Jayaratne
a72e65e31e Merge branch 'QA_4_5' 
Conflicts:
	js/messages.php
 2015-10-09 10:10:14 +11:00
Madhura Jayaratne
cc4c615720 Fix #11548 Confirm box on "Reset slave" option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-09 10:06:49 +11:00
Madhura Jayaratne
54b0409cc1 The error happens on version downgrade as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-09 09:40:20 +11:00
Madhura Jayaratne
208712796d Increase cookie version and improve cookie clearing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-09 08:36:37 +11:00
Marc Delisle
b5d6170b22 Clarify function name 
Remove function's side effect on globals

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-08 11:03:22 -04:00
Hugues Peccatte
37d2a661c0 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 22:49:49 +02:00
Hugues Peccatte
09f87f4770 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 22:09:55 +02:00
Hugues Peccatte
af7eaeb047 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 21:51:21 +02:00
Hugues Peccatte
0bc489bfd9 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-07 20:22:26 +02:00
Marc Delisle
b239793429 Clarify function name 
Clarify variable name

Remove duplicate test

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-07 11:02:34 -04:00
Marc Delisle
8668a92716 Merge commit 'efe0416' 2015-10-06 16:43:19 -04:00
Dan Ungureanu
6f802746d6 Fix #11542. Import parser broken in 4.5.x.x. 
Cherry-picked udan11/sql-parser@402890bc7b.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-06 23:20:54 +03:00
Hugues Peccatte
d1c6257136 Fix merge. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-06 22:01:39 +02:00
Hugues Peccatte
f34e84d635 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-06 20:51:59 +02:00
Marc Delisle
911217e6b4 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-06 07:33:41 -04:00
Madhura Jayaratne
dab71427cd Tracking does not make sense for information_schema 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-06 20:58:32 +11:00
Madhura Jayaratne
1411ffaaef Merge branch 'QA_4_5' 2015-10-06 20:39:59 +11:00
Madhura Jayaratne
ea68442ca3 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-10-06 20:33:45 +11:00
Madhura Jayaratne
a56aaada17 Fix #11544 Notices about undefined indexes on structure pages of information_schema tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-06 20:33:19 +11:00
Marc Delisle
be17cf15cb Merge branch 'QA_4_5' 2015-10-05 18:19:34 -04:00
Marc Delisle
ed8ba7b3d7 Fixes #11541 Missing arguments for PMA_Table::generateAlter() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-05 18:18:55 -04:00
Atul Pratap Singh
ad7d40c59e Merge branch 'QA_4_5' 2015-10-06 02:35:26 +05:30
Atul Pratap Singh
2ee40c302b Fix #11540 Undefined property: PMA_Table db_name 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-10-06 02:31:06 +05:30
Madhura Jayaratne
20974c6ae5 Merge branch 'QA_4_5' 2015-10-06 07:42:11 +11:00
Madhura Jayaratne
3c8ee7c5f8 Fix #11522 Strange behavior on table rename 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-05 20:50:55 +11:00
Hugues Peccatte
92bb13c78c Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-04 18:05:39 +02:00
Hugues Peccatte
6f4676cdfc Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-04 18:04:49 +02:00
Marc Delisle
3eea07d2ad Make scrutinizer happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-04 11:11:24 -04:00
Marc Delisle
3bdf520bcb Force the documented return type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-04 10:23:50 -04:00
Marc Delisle
0e7e952b7b Remove author name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-03 10:15:49 -04:00
Marc Delisle
fd7c8522ea Clarify method name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-03 10:14:29 -04:00
Hugues Peccatte
c0617bcd5f Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-03 15:14:47 +02:00
Madhura Jayaratne
5eef3a9b60 Merge branch 'QA_4_5' 2015-10-03 22:50:59 +10:00
Madhura Jayaratne
88527a0ff0 Merge pull request #11534 from udan11/fix_11519 
Fix #11519. Bug while exporting results when a joined table field name is in SELECT query.
 2015-10-03 22:44:07 +10:00
Madhura Jayaratne
5d2fa0d91b Merge branch 'QA_4_5' 2015-10-03 22:20:06 +10:00
Madhura Jayaratne
b41ab56e3b Fix #11526 Foreign key to other database's tables fails 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-03 22:14:49 +10:00
Dan Ungureanu
a707ab5616 Fixes #11519. Bug while exporting results when a joined table field name is in SELECT query. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-03 12:33:41 +03:00
Dan Ungureanu
f0354276d9 Support for references from other tables. 
Cherry-picked udan11/sql-parser@d1e565d2bb.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-03 12:33:23 +03:00
Hugues Peccatte
bd8fbb49be Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-03 08:23:49 +02:00
Dan Ungureanu
238e00b5d9 Fix #11531. Invalid SQL in table definition when exporting table. 
Cherry-picked udan11/sql-parser@e5b1cd830d.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-02 13:24:35 -04:00
Marc Delisle
f49f049636 Merge pull request #11532 from udan11/QA_4_5 
Fix #11531.
 2015-10-02 13:22:37 -04:00
Dan Ungureanu
4e668051ee Fix #11531. Invalid SQL in table definition when exporting table. 
Cherry-picked udan11/sql-parser@e5b1cd830d.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-02 18:19:31 +03:00
Hugues Peccatte
bd0d2b79db Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-01 18:19:18 +02:00
Marc Delisle
75acdb1344 Merge branch 'QA_4_5' 2015-10-01 11:29:29 -04:00
Marc Delisle
3df771238e Fixes #11524 Yellow star does not change in database Structure after add/remove from favorites 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-01 11:28:29 -04:00