gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,062 Commits 12 Branches 481 Tags 2.4 GiB
18cfc24743
Commit Graph

882 Commits

Author SHA1 Message Date
Marc Delisle
3f97698382 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-13 08:25:39 -05:00
Hugues Peccatte
8baf7c4a8a Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:21:54 +01:00
Marc Delisle
5a6d9c010b Undefined property 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-11 09:27:31 -05:00
Madhura Jayaratne
fd0f3d4264 Merge branch 'QA_4_5' 2015-12-11 16:29:12 +11:00
Madhura Jayaratne
f0aba98e35 Fix #11732 Exporting feature does not work with union table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 16:24:58 +11:00
Marc Delisle
66c15daba0 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-06 08:01:07 -05:00
Marc Delisle
357b1b4757 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-04 09:05:42 -05:00
Marc Delisle
2607023281 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-03 11:00:01 -05:00
Marc Delisle
9ee3931c09 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-03 10:43:10 -05:00
Marc Delisle
2f2b505a2e Fixes ##11711 Clarify the meaning of "Stand-in structure for view" in SQL export 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-02 10:44:14 -05:00
Michal Čihař
46a70dba88 Remove unused method (parent class defines it) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 13:54:04 +01:00
Marc Delisle
ab7942be89 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-29 07:29:32 -05:00
Deven Bansod
77f220cee5 Merge branch 'QA_4_5' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	libraries/plugins/auth/AuthenticationCookie.php
 2015-11-26 19:29:18 +05:30
Deven Bansod
8eb712579d Fixes #11693 : Flush privileges overusage - related to issue 11597 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 19:25:18 +05:30
Marc Delisle
80f079e525 Clarify message because a table name can be the same as a database name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-17 08:14:36 -05:00
Hugues Peccatte
22d93ba92f Merge remote-tracking branch 'origin/master' into psr1_master 2015-11-15 17:08:12 +01:00
Marc Delisle
06a4c57da1 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-09 05:39:17 -08:00
Hugues Peccatte
154a942145 Remove side effects in declaration files. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-27 18:56:40 +01:00
Madhura Jayaratne
abffc62a02 Merge branch 'QA_4_5' 2015-10-27 19:52:05 +11:00
Madhura Jayaratne
ac97a97cb8 Fix #11610, #11611 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-27 19:45:39 +11:00
Marc Delisle
8e666ec1b5 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-24 16:35:58 -04:00
Deven Bansod
223a7a5e4e Fix 11597 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-25 04:27:56 +05:30
Hugues Peccatte
e1dd0a9f97 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-18 22:51:01 +02: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
6f4676cdfc Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-04 18:04:49 +02: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
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
Hugues Peccatte
e81234d142 Fix typo in class name. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-30 21:54:17 +02:00
Hugues Peccatte
6c8c288067 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-29 21:19:57 +02:00
Marc Delisle
a111236a61 Merge commit 'a4fbbcc' 2015-09-29 05:17:36 -04:00
Nisarg Jhaveri
dca9a062ed bug #11510, AUTO_INCREMENT value always shown in export 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-09-29 03:05:43 +05:30
Hugues Peccatte
c752c01309 Merge branch 'master' into useNamespaces_master 2015-09-27 20:50:19 +02:00
Hugues Peccatte
0f80756fe6 Use pre-increment when possible. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 23:12:09 +02:00
Hugues Peccatte
71b62bcef9 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-26 13:50:49 +02:00
Marc Delisle
2f41ca05f7 Merge commit '8d202a3' 2015-09-25 07:21:32 -04:00
Dan Ungureanu
8d202a3dc1 Fixes #11497. 
Cherry-picked udan11/sql-parser@1415469.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 07:07:27 -04:00
Nisarg Jhaveri
b5c731ab62 Backport 053edda33f 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-24 04:05:26 -04:00
Marc Delisle
b468d57409 Merge commit 'bd84bb8' 2015-09-23 15:56:27 -04:00
Nisarg Jhaveri
053edda33f Fix #11492, AUTO_INCREMENT statements are partly missing from exports 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-09-24 00:34:07 +05:30
Madhura Jayaratne
7ec4bcdbea Use include for files being included conditionally 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-22 21:11:11 +10:00
Hugues Peccatte
914cdaa984 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-19 22:31:36 +02:00
Marc Delisle
0b87f93fec Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-19 13:21:17 -04:00
Hugues Peccatte
e23bbdf2a6 Set namespaces on GIS classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 22:33:15 +02:00
Hugues Peccatte
330c92ddf7 Set namespace on properties classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 22:16:23 +02:00
Hugues Peccatte
8c289e523b Revert transformation classes rename. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 21:48:43 +02:00
Hugues Peccatte
7185d61649 Set uses instead of absolute namespace. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 15:43:39 +02:00