Branch: refs/heads/QA_4_3
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 251a2aea780e0fe305ba8e0bdce2a3426e384fc4
https://github.com/phpmyadmin/phpmyadmin/commit/251a2aea780e0fe305ba8e0bdce…
Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M po/de.po
Log Message:
-----------
Translated using Weblate (German)
Currently translated at 100.0% (2978 of 2978 strings)
[CI skip]
Commit: f4c5012cc7d1aec0a8fcf58e78fc2f2f2cdc8145
https://github.com/phpmyadmin/phpmyadmin/commit/f4c5012cc7d1aec0a8fcf58e78f…
Author: Weblate <noreply(a)weblate.org>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M ChangeLog
M js/ajax.js
M libraries/common.inc.php
M libraries/plugins/auth/AuthenticationConfig.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/AuthenticationHttp.class.php
M test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5c02da89bef8...f4c5012cc7d1
Branch: refs/heads/QA_4_3
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: b92d3e104786ac58661632965e8a969a23f1983a
https://github.com/phpmyadmin/phpmyadmin/commit/b92d3e104786ac58661632965e8…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/ajax.js
M libraries/common.inc.php
M libraries/plugins/auth/AuthenticationConfig.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/AuthenticationHttp.class.php
M test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
Log Message:
-----------
Workaround for token mismatch error on server session timeout for config and http authentication types
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 5e1ab952b88098f6482064499d1b8c12af54aa5a
https://github.com/phpmyadmin/phpmyadmin/commit/5e1ab952b88098f6482064499d1…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/ajax.js
M libraries/plugins/auth/AuthenticationConfig.class.php
M libraries/plugins/auth/AuthenticationHttp.class.php
Log Message:
-----------
Use a separate flag to avoid confusion
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: ea7ca462e56c83792ddc6c9320215a3566ffbba2
https://github.com/phpmyadmin/phpmyadmin/commit/ea7ca462e56c83792ddc6c93202…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M libraries/plugins/auth/AuthenticationConfig.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/AuthenticationHttp.class.php
Log Message:
-----------
Document what these flags do
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 5c02da89bef87ff7161914662ebb9bf9449d97b2
https://github.com/phpmyadmin/phpmyadmin/commit/5c02da89bef87ff7161914662eb…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry for bug #4227
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2e9b80e9e325...5c02da89bef8