gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,029 Commits 12 Branches 481 Tags 2.4 GiB
9f8615dfb4
Commit Graph

95 Commits

Author SHA1 Message Date
Madhura Jayaratne
f65ac8803e Merge branch 'QA_4_1' 2014-02-08 13:06:10 +05:30
Madhura Jayaratne
59e3c9474a bug #4278 reCaptcha re-login requires double effort 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-08 13:04:32 +05:30
Marc Delisle
f5ba57c290 Revert "Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733" 
This reverts commit 36e544ce9e.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-03 10:11:44 -05:00
Marc Delisle
c406599995 Revert "Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733" 
This reverts commit 36e544ce9e.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-03 10:10:53 -05:00
Marc Delisle
464616c26b Merge commit '36e544c' 2014-02-03 08:44:37 -05:00
Marc Delisle
36e544ce9e Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-03 08:42:39 -05:00
Michal Čihař
396991a194 Merge remote-tracking branch 'origin/QA_4_1' 2014-02-03 09:01:55 +01:00
Michal Čihař
c6969bfb9e Properly encode & in URL 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2014-02-03 09:00:05 +01:00
Madhura Jayaratne
a5c6f555f9 Merge branch 'QA_4_1' 2014-02-02 22:56:55 +05:30
Madhura Jayaratne
22c851d1b8 bug #4259 reCaptcha sound session expired problem 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-02 22:53:11 +05:30
Madhura Jayaratne
fc34716720 reCaptcha theme 'while' matches better with PMA themes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-02 22:22:53 +05:30
Madhura Jayaratne
d1af87b7e6 Merge branch 'QA_4_1' 2014-02-02 22:18:49 +05:30
Madhura Jayaratne
6a7d3f9ed7 bug #4260 reCaptcha is ignoring language settings 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-02 22:15:56 +05:30
Michal Čihař
b4d03dc9f5 Correct punctuation for sentences 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:30:39 +01:00
Michal Čihař
1d76d52baf Missing punctuation at the end of sentences 2014-01-29 15:21:02 +01:00
Hugues Peccatte
ae0c9218ce PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-09 20:51:40 +01:00
Madhura Jayaratne
74aebe629b Spaces around . operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 18:06:02 +05:30
Madhura Jayaratne
84e9ce4946 Spaces around . operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 17:26:27 +05:30
Hugues Peccatte
d27076392c Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-11 20:44:12 +01:00
Hugues Peccatte
20ab7112bb Fix PHPCS errors/warnings from Jenkins. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-10 21:57:17 +01:00
Marc Delisle
7411185bd6 Fix coding style 2013-12-03 06:18:14 -05:00
Marc Delisle
9ad4e64719 Fix coding style 2013-11-22 05:26:45 -05:00
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Hugues Peccatte
ca8eb087cc Revert third party modifications. 2013-11-09 11:04:52 +01:00
Hugues Peccatte
1f09a22281 Fix PHPDoc. 2013-11-08 22:41:05 +01:00
Madhura Jayaratne
20608589c3 Remove trailing white spaces 2013-10-19 14:29:05 +05:30
Dieter Adriaenssens
0b86704892 fix coding style : wrap long lines 2013-09-24 15:33:21 +02:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Marc Delisle
269d0c89fe Fix merge conflicts 2013-07-28 06:17:38 -04:00
Marc Delisle
90d968b447 Fix merge conflicts 2013-07-17 15:18:09 -04:00
ayushchd
6f2a532bf0 Tests for AuthenticationHttp and AuthenticationSignon 2013-07-17 17:33:09 +05:45
ayushchd
7312cd5b01 Tests for AuthenticationConfig and AuthenticationCookie 2013-07-16 21:44:49 +05:45
Michal Čihař
df3502e804 Another adding of comma to sentences 2013-07-12 15:54:18 +02:00
Michal Čihař
31a1167f19 End sentence with a stop 2013-07-12 14:58:09 +02:00
Michal Čihař
c0ce163e05 Drop some unused local variables 
Found by PMD on our CI server
 2013-07-10 14:53:05 +02:00
Michal Čihař
7fced0d26c Correctly pass usernam in signon auth 2013-07-10 14:53:04 +02:00
Michal Čihař
9bcf95f235 Remove extra parenthesis 2013-06-12 10:57:00 +02:00
Michal Čihař
fab879f924 Simplify reCaptcha configuration 
Once private and public keys are in place, it is enabled. I see no need
for per server setup.
 2013-06-12 09:38:10 +02:00
Michal Čihař
3a7139db70 Use shorter notion of server array 2013-06-11 16:00:22 +02:00
Michal Čihař
dfb81b4b92 Coding style improvements 2013-06-11 15:59:23 +02:00
Michal Čihař
d08730780a Consistent config naming with other config options (issue #369) 2013-06-11 15:30:14 +02:00
Michal Čihař
65a083f6d4 Merge branch 'RECAPTCHA2' of git://github.com/pbojan/phpmyadmin into pbojan-RECAPTCHA2 
Conflicts:
	libraries/Header.class.php
 2013-06-11 15:28:19 +02:00
Marc Delisle
e6b1391af9 Fix merge conflicts 2013-05-28 08:49:37 -04:00
Marc Delisle
ec6a47d8a0 bug #3957 Cookies must be enabled past this point 2013-05-28 08:46:04 -04:00
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Bojan Petkovski
95f5df348d Recaptcha bug fixes 
Error message for empty captcha "Please enter correct captcha!" and if
the user enters correct captcha but wrong login data it won't be
required to enter it next time.
 2013-05-20 22:43:07 +02:00
Bojan Petkovski
4213c3c285 ReCaptcha error message 2013-05-12 13:33:09 +02:00
Bojan Petkovski
e9f5a30ae5 ReCaptcha https and CSP bug fixes 2013-05-11 17:53:34 +02:00
Bojan Petkovski
1832c8fa33 ReCaptcha feature 2013-05-11 17:53:32 +02:00
J.M
fc62e1f9f6 Merge branch 'origin/QA_4_0' 
Conflicts:
	js/keyhandler.js
	js/tbl_structure.js
 2013-04-30 17:46:36 +02:00