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

859 Commits

Author SHA1 Message Date
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
Hugues Peccatte
99633d238a Fix wrong case in files. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 15:01:59 +02:00
Hugues Peccatte
857c8a92cf Move abstract transformation plugins to abs folder. 
Update templates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 14:13:31 +02:00
Hugues Peccatte
fa801c507f Set namespace on plugins classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 12:51:45 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Madhura Jayaratne
93bfdbe371 Remove more references to Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:58 +10:00
Madhura Jayaratne
7fadb9e37f Remove Drizzle support from import and export 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:37 +10:00
Marc Delisle
337658a927 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-08 11:38:50 -04:00
Marc Delisle
f447cd94b0 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-08 11:35:05 -04:00
Madhura Jayaratne
785f4e2711 Fix reCaptcha bypass 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-08 07:13:24 +10:00
Dan Ungureanu
4607c709ac Fixes #11465. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-09-07 19:50:07 +03:00
Hugues Peccatte
e2470ccdc7 Add missing require. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-06 19:05:26 +02:00
Hugues Peccatte
4d9fe98ec6 Add missing elements of ExportOds class. 
Remove includes of plugins.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-06 18:59:29 +02:00
Hugues Peccatte
ececab6c8c Attempts to fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-06 11:59:37 +02:00
Hugues Peccatte
70acefd180 Replace Response calls by short calls. 
Add missing require.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-05 23:39:02 +02:00
Hugues Peccatte
6c594eb0cf Fix calls. 
Remove useless PHPDoc.
Add missing require.
Add missing 'use'.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-05 22:58:47 +02:00
Marc Delisle
a2898d760e Fixes #11463 Cannot redeclare class phpseclib\Crypt\AES 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-05 12:20:09 -04:00
Hugues Peccatte
178a6edd38 Add namespace on part of plugins classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-05 00:33:42 +02:00
Hugues Peccatte
04b4f723d8 Move libraries/plugins/auth and export classes into a namespace. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-05 00:09:30 +02:00
Hugues Peccatte
b1038cfefa Merge branch 'master' into useNamespaces_master 2015-09-04 22:37:45 +02:00
Madhura Jayaratne
06e0773d94 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-09-03 09:54:41 +10:00
Madhura Jayaratne
b48c414c0b Fix bugs introduced in 788c96e8c7 while fixing issue #11442 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-03 09:53:34 +10:00
Hugues Peccatte
32fd26ad42 Merge branch 'master' into useNamespaces_master 2015-09-02 21:48:40 +02:00
Dmitry Bakshaev
c1495982ab cookie authentication: fix cookie_iv length detection with mb_string overload 
Signed-off-by: Dmitry Bakshaev <dab1818@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-02 11:35:45 -04:00