gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,872 Commits 12 Branches 481 Tags 2.4 GiB
d248f77458
Commit Graph

333 Commits

Author SHA1 Message Date
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
Madhura Jayaratne
52e0087b0e Long messages wrapped 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-11 17:45:59 +05:30
Hugues Peccatte
80ced5fe8f Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 18:37:49 +01:00
Hugues Peccatte
80869ba0ec Merge branch 'master' into stringFunctions_useStandardFunctions_master 2014-10-25 17:08:48 +02:00
Marc Delisle
5df7783e97 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-22 12:41:06 -04:00
Hugues Peccatte
74f0beda8f Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 20:56:12 +02:00
Madhura Jayaratne
fa3c538341 Align 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 15:08:28 +05:30
Madhura Jayaratne
00f2788a66 bug #4560 PHP error on master branch 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 13:35:16 +05:30
Marc Delisle
bc7d57f613 The minimum supported MySQL version is 5.5 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-16 13:32:15 -04:00
Madhura Jayaratne
3ac46455cf Revert "The DisableIS directive is removed" 
This reverts commit d8fd82a9f5.

Conflicts:
	ChangeLog
	doc/config.rst
	libraries/config.default.php
	libraries/config/messages.inc.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:29:55 +05:30
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Marc Delisle
0809fd14cb Move include file to a function 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-18 13:01:49 -04:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Ashutosh Dhundhara
35dab58bf5 RFE#1492: Remove the distinct query window. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-12 01:47:20 +05:30
Ashutosh Dhundhara
7a9569f6b5 RFE#1123: Zeroconf PMA tables support. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-11 18:33:59 +05:30
Marc Delisle
4aa4f20b7a Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-23 11:46:19 -04:00
Marc Delisle
17fd38e23e Merge branch 'QA_4_2' 2014-06-05 12:45:07 -04:00
Marc Delisle
94e43de453 Add enforcement of the minimum supported PHP version (5.3.0) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-05 12:44:34 -04:00
Marc Delisle
ee22d3e65d Merge branch 'QA_4_2' 2014-06-05 12:28:25 -04:00
Marc Delisle
9112d7c930 bug #4437 Problems due to missing enforcement of the minimum supported MySQL version 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-05 12:27:03 -04:00
Michal Čihař
e984b2a609 The ini_set function takes string, not booleans or integers 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:57:10 +02:00
Michal Čihař
2fa4a0084c Simplify condition for running stripslashes 
- get_magic_quotes_gpc is always present in supported PHP versions
- get_magic_quotes_gpc returns false since PHP 5.4.0 where related
  setting has been removed

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-10 13:30:44 +02:00
Michal Čihař
7233657d4d Remove support for SQL validator 
The SOAP service seems to be down for quite some time and it is not
mentioned anywhere on Mimer website.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-02 12:10:52 +02:00