Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bdb29a04d661946110b2733d030a3cd5b3fc660f https://github.com/phpmyadmin/phpmyadmin/commit/bdb29a04d661946110b2733d030a... Author: Siddhesh Rane <kingsid911@gmail.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M po/hi.po Log Message: ----------- Translated using Weblate (Hindi) Currently translated at 37.4% (1199 of 3199 strings) [CI skip] Commit: c603141bdd7412606950cb459b092fd286d42b7f https://github.com/phpmyadmin/phpmyadmin/commit/c603141bdd7412606950cb459b09... Author: Weblate <noreply@weblate.org> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M libraries/URL.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 Commit: 3508fa9ee258102cf8f693044b7cae1c14cab579 https://github.com/phpmyadmin/phpmyadmin/commit/3508fa9ee258102cf8f693044b7c... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Log Message: ----------- Merge branch 'QA_4_7' Commit: 7667689d65b812426eb049a55c91ae3f2561d455 https://github.com/phpmyadmin/phpmyadmin/commit/7667689d65b812426eb049a55c91... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M js/functions.js Log Message: ----------- Use more reasonable timeouts for keepalive - always update before session expiry - shorter interval in the end Fixes #11231 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: dc3ef3ce7f55cd19d01192ccd029230833f28cd1 https://github.com/phpmyadmin/phpmyadmin/commit/dc3ef3ce7f55cd19d01192ccd029... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M ChangeLog M js/functions.js M libraries/Header.php Log Message: ----------- Try harder to honor LoginCookieValidity setting Even when it is lower than session.gc_maxlifetime we try to keepalive the session by AJAX. Fixes #11231 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 82f13e34d0f9e96960f5bdbf7fd3edc048c69f58 https://github.com/phpmyadmin/phpmyadmin/commit/82f13e34d0f9e96960f5bdbf7fd3... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M js/functions.js M libraries/plugins/AuthenticationPlugin.php M libraries/plugins/auth/AuthenticationCookie.php M test/classes/plugin/auth/AuthenticationCookieTest.php Log Message: ----------- Better handle multiple open browser windows Calculate session expiry per browser (tracking is based on sessionStorage which is unique per tab). With this we're able to detect that there is another window open and actively used and avoid logging it out by inactive one. Issue #11231 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 26d7d4269d8234c48c4a85af8bc4de491b2aad96 https://github.com/phpmyadmin/phpmyadmin/commit/26d7d4269d8234c48c4a85af8bc4... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M ChangeLog M js/functions.js M libraries/Header.php M libraries/plugins/AuthenticationPlugin.php M libraries/plugins/auth/AuthenticationCookie.php M test/classes/plugin/auth/AuthenticationCookieTest.php Log Message: ----------- Merge branch 'QA_4_7' Commit: 813e0dbae261089ca6b89ad6fa2c26776d3d3e31 https://github.com/phpmyadmin/phpmyadmin/commit/813e0dbae261089ca6b89ad6fa2c... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M po/hi.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ee4660353040...813e0dbae261