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

376 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
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
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
71b62bcef9 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-26 13:50:49 +02:00
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
21460a01c0 Merge branch 'master' into useNamespaces_master 2015-09-18 23:17:22 +02:00
Marc Delisle
ecb5a0de32 Use strict comparison on a hash value 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-15 15:39:15 -04:00
Hugues Peccatte
a5d35d41b6 Revert PMA_String rename. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-14 22:39:03 +02:00
Hugues Peccatte
74ef226857 Merge branch 'master' into useNamespaces_master 2015-09-14 22:10:51 +02:00
Marc Delisle
8ad850a820 Merge commit '4185868' 2015-09-14 10:51:40 -04:00
Remi Collet
41858689dd allow to use system udan11/sql-parser 
Signed-off-by: Remi Collet <fedora@famillecollet.com>
 2015-09-14 10:47:37 -04:00
Hugues Peccatte
0233cc5fe1 Use include instead of include_once to force load. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 23:25:34 +02:00
Hugues Peccatte
e57640fa50 Remove last '.class' in code. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 22:39:41 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Madhura Jayaratne
f3ff8403f2 Remove more Drizzle support 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:39 +10: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
e5e447e937 Set namespace on config classes. 
Update config classes.
Add @noinspection tag.
Update documentation and script.
Set ConfigGenerator in a namespace.
Rename ConfigGenerator filename.
Remove ConfigGenerator requires.
Fix namespaces of mock objects.
Remove useless require.
Add missing 'use'.
Add missing require.
Update PHPDoc.
Fix class test typo.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:23 +02:00
Hugues Peccatte
5eb578e9a2 Split Types, TypesMySQL and TypesDrizzle classes in 3 files. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:22 +02: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
58b10807c8 Rename classes files. 
Rename classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:22 +02:00
Hugues Peccatte
0761fb1801 Rename classes files. 
Rename classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:21 +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
Hugues Peccatte
a1b134c09e Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 22:38:34 +02:00
Marc Delisle
6a9d80eb89 Minimum supported PHP version is now 5.5 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-21 07:55:16 -04: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
2b2b4777b4 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:42:41 +05:30
Dan Ungureanu
8d04cd5db8 Improved context detection. 
Use the delimiter specified by user.
 2015-07-11 18:10:03 +03:00
Dan Ungureanu
ae733edf41 Removed the old parser. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:18 +03:00
Dan Ungureanu
83c6f77716 Updated sql-parser library. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:13 +03:00
Dan Ungureanu
e73c7a4967 Fixed coding style. 
Updated sql-parser library.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:13 +03:00
Dan Ungureanu
2c341191e6 Make use of multiple contexts. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:12 +03:00
Dan Ungureanu
ee6dd2e7c0 Added sql-parser with a modified version of the Composer autoloader to load the library. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:10 +03:00
Madhura Jayaratne
01354d9d95 #1561 Being able to use multiple servers at the same time when using cookie auth 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-25 17:33:18 +05:30
Alexei Yuzhakov
d384a6b432 Ability to contol the minimal MySQL version via config. 
Signed-off-by: Alexei Yuzhakov <sibprogrammer@gmail.com>
 2015-06-15 08:05:17 +06:00
Deven Bansod
aeae86d7cc RFE#701 - Print View using CSS - Rewrite 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-01 03:57:50 +05:30
Marc Delisle
424b5339f9 Merge branch 'QA_4_4' 2015-05-26 15:03:12 -04:00
Marc Delisle
830d39816b bug #4924 Recaptcha failure 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-26 15:02:39 -04:00
Nisarg Jhaveri
9c77ec694e Navigation panel settings 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-22 17:15:03 +05:30
Madhura Jayaratne
286b31c71d Merge branch 'QA_4_4' 2015-05-12 07:24:15 +05:30
Madhura Jayaratne
47b734473e bug #4512 ForceSSL Redirect Check 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-11 11:29:45 +05:30
Madhura Jayaratne
85064d4ae3 Merge branch 'QA_4_4' 2015-04-24 10:03:41 +05:30
Madhura Jayaratne
738b37477b bug #4869 Drop column action not asking to confirm 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-24 10:01:29 +05:30
Madhura Jayaratne
b398635e1a Merge branch 'QA_4_4' 2015-04-14 10:01:05 +05:30
Madhura Jayaratne
fe3a103767 bug #4851 PHP errors in login dialogue 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-14 09:57:52 +05:30
Marc Delisle
6e748aa7fb Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-12 07:30:53 -04:00