Branch: refs/heads/QA_4_3 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> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2e9b80e9e325...5c02da89bef8