Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b92d3e104786ac58661632965e8a969a23f1983a https://github.com/phpmyadmin/phpmyadmin/commit/b92d3e104786ac58661632965e8a... Author: Madhura Jayaratne <madhura.cj@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@gmail.com> Commit: 5e1ab952b88098f6482064499d1b8c12af54aa5a https://github.com/phpmyadmin/phpmyadmin/commit/5e1ab952b88098f6482064499d1b... Author: Madhura Jayaratne <madhura.cj@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@gmail.com> Commit: ea7ca462e56c83792ddc6c9320215a3566ffbba2 https://github.com/phpmyadmin/phpmyadmin/commit/ea7ca462e56c83792ddc6c932021... Author: Madhura Jayaratne <madhura.cj@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@gmail.com> Commit: 5c02da89bef87ff7161914662ebb9bf9449d97b2 https://github.com/phpmyadmin/phpmyadmin/commit/5c02da89bef87ff7161914662ebb... Author: Madhura Jayaratne <madhura.cj@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@gmail.com> Commit: 251a2aea780e0fe305ba8e0bdce2a3426e384fc4 https://github.com/phpmyadmin/phpmyadmin/commit/251a2aea780e0fe305ba8e0bdce2... Author: Ann + J.M <phpMyAdmin@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/f4c5012cc7d1aec0a8fcf58e78fc... Author: Weblate <noreply@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 Commit: eb79ad9181734a77ae956a2add430a1ed08275bd https://github.com/phpmyadmin/phpmyadmin/commit/eb79ad9181734a77ae956a2add43... Author: Madhura Jayaratne <madhura.cj@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: ----------- Fix typo Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 3f673637b742f615dfaa83b181f995b28db5d04a https://github.com/phpmyadmin/phpmyadmin/commit/3f673637b742f615dfaa83b181f9... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-11-28 (Fri, 28 Nov 2014) Changed paths: M po/de.po Log Message: ----------- Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 Commit: 1c6af0f7b9b756a58955ba02d3043a4a077f1d7c https://github.com/phpmyadmin/phpmyadmin/commit/1c6af0f7b9b756a58955ba02d304... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-11-28 (Fri, 28 Nov 2014) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_3' Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3cd0eceb5510...1c6af0f7b9b7