Commit Graph

68 Commits

Author SHA1 Message Date
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
J.M
e25bba8bcc Fix notice Undefined index: old_usr in AuthenticationHttp.class.php:162 2013-04-28 17:29:50 +02:00
J.M
4035c079e6 Merge branch 'origin/QA_4_0' 2013-04-28 13:15:20 +02:00
J.M
4fa8633474 Add rfe #1421 Add retry button on connection failure with config auth 2013-04-28 12:31:21 +02:00
J.M
459b2807fd Correct welcome message horizontal alignment for config auth 2013-04-28 12:00:11 +02:00
Michal Čihař
2fbb4cee0d Consistently include colon in strings to translate
In some languages this makes difference in translating, so it's better
to give translators full context.
2013-04-25 14:22:31 +02:00
Marc Delisle
29b297f41f Fix bug "#3853 Blowfish implementation might be broken" by replacing the
library with phpseclib

I could not make PMA_blowfish_test.php work with the new library.
2013-04-01 07:04:25 -04:00
Marc Delisle
7b7abce116 Clarify the logic 2013-04-01 06:44:42 -04:00
Madhura Jayaratne
b3db1f0d6f Change mysqlDie() to return the error message when $exit parameter is false 2013-03-28 17:34:40 +05:30
Gemorroj
fc51a91713 many some minor fixes (sorry, see diff) 2013-01-26 15:35:29 +03:00
Dieter Adriaenssens
87a70c8843 improve coding style 2013-01-21 13:37:45 +01:00
J.M
49771711fe After session expiry and re-login, bring user back to the page they were on. See issue #125 2012-12-27 19:33:48 +01:00
J.M
18d2463b41 Show login link in error message on cookie or session expiry 2012-12-27 16:06:09 +01:00
Marc Delisle
95fa48fc8e Remove remaining code in tbl_alter.php 2012-12-18 15:44:39 -05:00
Rouslan Placella
f730b7745d Improve response for failed http login 2012-11-26 23:08:15 +00:00
Rouslan Placella
bc9e81aa14 Fixed broken logout functionality got http auth 2012-11-26 22:56:37 +00:00
Michal Čihař
61a601fc73 Implement linking to new documentation 2012-11-12 09:48:05 +01:00
Michal Čihař
3c68a0b020 Merge pull request #104 from roccivic/drop-dead-code
Dropped dead code
2012-11-07 07:02:48 -08:00
Rouslan Placella
03561b892c Dropped dead code 2012-11-05 22:19:18 +00:00
Rouslan Placella
ece1ae6b17 Fixed bug #3583343 - Incorrect page after expired session 2012-11-05 22:10:39 +00:00
Rouslan Placella
963a196fb1 Renamed PMA_Language_select and dropped use of echo in this function 2012-11-05 20:26:12 +00:00
Michal Čihař
d20b2bd412 Use elipsis instead of three dots, this looks nicer 2012-10-31 14:29:30 +01:00
Rouslan Placella
49d2d6f5fb Fixed behavior of NavigationDisplayServers configuration directive 2012-10-30 20:16:57 +00:00
Rouslan Placella
1b69d0bf55 Drop the target attrbute from links and forms 2012-10-30 20:10:20 +00:00
Rouslan Placella
9e3a9ee52f Dropped main.php 2012-10-30 20:10:20 +00:00
Rouslan Placella
c24010362f Dropped references to index.php 2012-10-30 20:07:02 +00:00
Michal Čihař
869d7c0e99 Use single quotes when we do not want to evaluate the string 2012-10-16 11:18:16 +02:00
Madhura Jayaratne
2ebcfa1da7 Last parameter comment requires a blank newline after it 2012-09-22 22:35:51 +05:30