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

211 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
0b87f93fec Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-19 13:21:17 -04:00
Marc Delisle
337658a927 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-08 11:38:50 -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
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
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
00bd7f02f3 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 19:36:16 +02:00
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
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
cb9cc68fe9 Fixed more issues. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:33 +03:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Michal ฤŒihaล™
b39cb1cb81 Merge remote-tracking branch 'origin/QA_4_4' 2015-07-02 13:40:23 +02:00
Michal ฤŒihaล™
a6fd4c2ed4 Cleanup URLs to our website 
- use https everywhere
- follow redirects on renamed pages

Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
 2015-07-02 13:39:10 +02:00
Deven Bansod
edad7fcb3c Replace script names as config options with plain english words 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-13 04:41:54 +05:30
Marc Delisle
675b589dce Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-03 07:13:07 -04:00
Madhura Jayaratne
52a06ee5f9 Merge branch 'QA_4_4' 2015-05-29 15:37:50 +05:30
Madhura Jayaratne
0391bab825 bug #4931 False error before entering reCAPTCHA 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-29 15:30:19 +05:30
Marc Delisle
50fb7adee4 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-28 10:23:28 -04:00
Madhura Jayaratne
63fef03cc7 is_process_priv is no longer used 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-22 09:32:36 +05:30
Hugues Peccatte
f0792503e9 Update to fix tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 14:24:31 +02:00
Hugues Peccatte
18625f3bbf Update PHPDoc and minor coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 13:15:08 +02:00
Madhura Jayaratne
bdf66cd772 Merge branch 'QA_4_4' 2015-05-14 07:10:10 +05:30
Madhura Jayaratne
5ca7f19d05 Invalid value for CURLOPT_SSL_VERIFYPEER 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 06:52:26 +05:30
Madhura Jayaratne
5857fe163d Fix spacing after opening brace 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 11:05:08 +05:30
Madhura Jayaratne
0cb93d6870 File is being conditionally included; use "include" instead 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 19:11:26 +05:30
Madhura Jayaratne
aa1c35cedf Remove trailing whitespace 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:26:09 +05:30
Madhura Jayaratne
9f1f0e6bc1 Per server iv 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-16 08:34:40 +05:30
Madhura Jayaratne
d162f4f3bd Per server iv 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 15:32:46 +05:30
Madhura Jayaratne
9bf5792dc0 Merge branch 'QA_4_3' into QA_4_4 2015-03-09 14:48:43 +05:30
Madhura Jayaratne
7dde05cc41 phpUnit is unable to mock private methods 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 14:17:15 +05:30
Madhura Jayaratne
df39cff9ef Return value from the new method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 13:53:12 +05:30
Madhura Jayaratne
42bbc5e04d bug #4758 Firefox with auth_type to http with multiple server doesn't work anymore 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 13:24:28 +05:30
Marc Delisle
ff35677c26 Merge pull request #1523 from madhuracj/rfe1602 
Alternative implementation for rfe #1602
 2015-03-01 06:33:41 -05:00
Madhura Jayaratne
1b939fb3d3 rfe #1441 Add regexp match when using AllowArbitraryServer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-26 17:02:09 +05:30
Madhura Jayaratne
e506afc3b0 Revert "Save unfinished work" 
This reverts commit 3007c6a6ef.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-26 11:53:48 +05:30
Hugues Peccatte
05ebf9a3a7 Fix typos. 
Minor PHPDoc update.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-22 22:54:09 +01:00
Zhang Hao
3007c6a6ef Save unfinished work 
Signed-off-by: Zhang Hao <jason.daurus@gmail.com>
 2015-02-13 18:46:09 +08:00
Marc Delisle
be03cb3f27 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-02 06:25:37 +01:00
Madhura Jayaratne
743a528835 rfe #1590 Recaptcha API v2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-08 15:49:24 +05:30
Marc Delisle
69052a0663 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-07 18:40:53 -05:00
Marc Delisle
f87458719e Merge branch 'QA_4_3' 2014-12-07 06:41:20 -05:00
Robert Scheck
d9468e3fff Bug #4623 Incomplete PHP OpenSSL support 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-07 06:37:15 -05:00
Madhura Jayaratne
478e781f1b Replace more instances of .live() and .die() with .on() and .off() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-04 18:33:37 +05:30
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