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

355 Commits

Author SHA1 Message Date
Marc Delisle
fd7c8522ea Clarify method name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-03 10:14:29 -04: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
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
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
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
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
Madhura Jayaratne
847fa854e6 Output buffering for static JS 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-09 14:07:36 +05:30
Madhura Jayaratne
0f720c5375 bug #4754 pMA DB not detected properly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-31 18:52:38 +05:30
Marc Delisle
1ff119090c Use positional arguments 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-12 08:51:54 -05:00
Dennis Broeks
8955c0935f Feature request 1312: Added configuration option for setting the timezone of the current database connection. 
Signed-off-by: Dennis Broeks <dennis@uitzendbureau.nl>
 2015-02-10 15:43:47 +01:00
Madhura Jayaratne
153988f0f9 This link no longer works 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-23 16:54:28 +05:30
Madhura Jayaratne
de81f53d45 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 11:33:31 +05:30
Madhura Jayaratne
5691cdb880 bug #4691 Do not include console when no server is selected 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 11:26:38 +05:30
Madhura Jayaratne
245e730f56 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 10:53:42 +05:30
Madhura Jayaratne
99aad2c118 bug #4685 Call to a member function isUserType() on a non-object 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 10:49:33 +05:30
Madhura Jayaratne
354ac7975a Do not try to auto configure pma tables if PMA_MINIMUM_COMMON is defined 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-06 16:49:51 +05:30
Marc Delisle
56baec6160 Merge branch 'QA_4_3' 2015-01-04 07:35:26 -05:00
Madhura Jayaratne
dfae4d2f08 Bug #4676 - Auto configuration issues 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 09:49:03 +05:30
Marc Delisle
944bc3abad Merge branch 'QA_4_3' 2014-12-20 13:33:43 -05:00
Marc Delisle
5429d91ce1 bug ['Error_Handler']['display'] no longer necessary 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-20 13:32:34 -05:00
Marc Delisle
9591205e2c Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 09:06:49 -05:00
Marc Delisle
41c02abc41 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-03 09:02:25 -05:00
Madhura Jayaratne
a4e8d008f4 bug #4611 [security] DOS attack with long passwords 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 08:50:14 -05:00
Hugues Peccatte
c2d516cac4 Remove unused variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-01 21:19:13 +01:00
Michal Čihař
2ce7aa70c4 Move storing password/username after checking password 
The cookie encryption is quite expensive, so let's move it after we
check password validity.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 09:50:16 +01:00
Madhura Jayaratne
b92d3e1047 Workaround for token mismatch error on server session timeout for config and http authentication types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:56:28 +05:30
Madhura Jayaratne
783cacbd1e Workaround for token mismatch error on server session timeout for config and http authentication types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 17:37:39 +05:30