Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6eb4baed940c2ee827c5351d20a1a82730f919c0 https://github.com/phpmyadmin/phpmyadmin/commit/6eb4baed940c2ee827c5351d20a1... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-03-16 (Wed, 16 Mar 2016)
Changed paths: M ChangeLog
Log Message: ----------- Fix typo
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 1523985bce4aeb15950e80aa75183a473c06430f https://github.com/phpmyadmin/phpmyadmin/commit/1523985bce4aeb15950e80aa7518... Author: Michal Čihař michal@cihar.com Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationHttp.php
Log Message: ----------- Fix login after logout with http authentication
We can not check token here as it's always there (in the URL) after logout.
Fixes #12098
Signed-off-by: Michal Čihař michal@cihar.com
Commit: f8ead4738e49b0215b325d4bec3568503216f809 https://github.com/phpmyadmin/phpmyadmin/commit/f8ead4738e49b0215b325d4bec35... Author: Michal Čihař michal@cihar.com Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationHttp.php
Log Message: ----------- Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/251cd5d071b1...f8ead4738e49