gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,416 Commits 12 Branches 481 Tags 2.4 GiB
3539b01740
Commit Graph

819 Commits

Author SHA1 Message Date
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
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
Hugues Peccatte
7f8f34e89d Remove classes require_once. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:22 +02:00
Hugues Peccatte
f0ba28fc1d Set namespace on Advisor, Config, Console and Util classes. 
Set namespace on DbQbe.
Set namespace to 'DbSearch'.
Split Advisor.class.php file.
Change Advisor namespace.
Rename DbQbe class and file.
Set namespace on DisplayResults.
Set namespace on Error.
Use namespace for ErrorHandler.
Add class autoloader.
Change ErrorHandler filename.
Remove some require.
Update Config namespace path.
Update PMA_Util to PMA\libraries\Util.
Rename Font and File classes files.
Use namespace for Footer.
Set namespace in all libraries classes.
Namespace OutputBuffering.
Export SubPartition.
Rename Partition file.
Namespace PDF.
Namespace RecentFavoriteTable.
Replace PMA_Response by Response and PMA_Message by Message.
Update uses and calls.
Fix unit tests.
Fix SqlParser autoload.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:22:52 +02:00
Madhura Jayaratne
788c96e8c7 Fix #11442 MySQL 5.7 and SHOW VARIABLES 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-31 17:10:32 +10:00
Madhura Jayaratne
154d62d27d Fix #11436 CREATE DATABASE should be enabled by default on server exports 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-28 18:52:37 +10:00
Madhura Jayaratne
6eb6786506 Standardize to sentence case 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-26 16:57:42 +10:00
Hugues Peccatte
17fb74d2cf Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-25 16:20:31 +02:00
Atul Pratap Singh
917add1528 Merge pull request #11370 from gzzhanghao/unittest 
Recover test coverage
 2015-08-25 13:30:44 +05:30
Hugues Peccatte
bd707b871d Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 23:34:50 +02:00
Hugues Peccatte
a1b134c09e Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 22:38:34 +02:00
Hugues Peccatte
00bd7f02f3 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 19:36:16 +02:00
Hugues Peccatte
43077d22a3 PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-23 13:29:33 +02:00
Marc Delisle
325c318e00 Clarify explanation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-22 07:47:49 -04:00
Marc Delisle
569e0c1414 Merge pull request #11419 from nisargjhaveri/combine_indexes 
Create indexes with table creation if "IF NOT EXISTS" is on
 2015-08-22 07:37:45 -04:00
Nisarg Jhaveri
b2e8e4660b Create indexes with table creation if "IF NOT EXISTS" is on 
- change default of IF NOT EXISTS option in export
- Add warning for efficiency with IF NOT EXISTS option

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-08-22 02:18:38 +05:30
Madhura Jayaratne
aed8527845 Make the SQL exports compatible for side by side comparison with old exports 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 23:45:46 +05:30
Madhura Jayaratne
e27ae93962 Organize export options 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:46:24 +05:30
Madhura Jayaratne
3307089efa Be more explicit that this directive is about auto increment value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:38:25 +05:30
Madhura Jayaratne
f5a02f0eca sql_auto_increment is about auto increment value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:30:44 +05:30
Madhura Jayaratne
da1d274078 Fix - Respect the Auto increment checkbox 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:24:29 +05:30
Madhura Jayaratne
769a8aa15f Fix #11414 Unclear export options / organization / hierarchy 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:06:38 +05:30
Marc Delisle
da05ed6316 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-19 08:32:45 -04:00
Martin Herndl
97d0415687 Fixes #11386 Cannot import database with long data in one column 
Signed-off-by: Martin Herndl martin.herndl@world4you.com
 2015-08-19 08:28:26 -04:00
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
Jason
59b11954f4 Recover tests for PMA_Table and rename sGetStatusInfo to getStatusInfo 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-08-12 16:48:40 +08: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