Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5a401b192eb0ed723638deda015fb5e9ea670051 https://github.com/phpmyadmin/phpmyadmin/commit/5a401b192eb0ed723638deda015f... Author: Michal Čihař <michal@cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #6197 and #13787 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 192edd9324ff459fde10c74126ad52e3f163860a https://github.com/phpmyadmin/phpmyadmin/commit/192edd9324ff459fde10c74126ad... Author: Michal Čihař <michal@cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M doc/second_factor.rst Log Message: ----------- Add wikipedia link for TOTP Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 5acd64f84d964e5f2db6170ecb5a42581e74ca12 https://github.com/phpmyadmin/phpmyadmin/commit/5acd64f84d964e5f2db6170ecb5a... Author: Michal Čihař <michal@cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M doc/config.rst R doc/second_factor.rst A doc/two_factor.rst M doc/user.rst M libraries/classes/Plugins/AuthenticationPlugin.php R libraries/classes/Plugins/SecondFactor/Application.php R libraries/classes/Plugins/SecondFactor/Key.php R libraries/classes/Plugins/SecondFactor/Simple.php R libraries/classes/Plugins/SecondFactorPlugin.php A libraries/classes/Plugins/TwoFactor/Application.php A libraries/classes/Plugins/TwoFactor/Key.php A libraries/classes/Plugins/TwoFactor/Simple.php A libraries/classes/Plugins/TwoFactorPlugin.php R libraries/classes/SecondFactor.php A libraries/classes/TwoFactor.php M libraries/common.inc.php M libraries/config.default.php M libraries/user_preferences.inc.php M prefs_second.php R templates/login/second.twig R templates/login/second/application.twig R templates/login/second/application_configure.twig R templates/login/second/key.twig R templates/login/second/key_configure.twig R templates/login/second/simple.twig A templates/login/twofactor.twig A templates/login/twofactor/application.twig A templates/login/twofactor/application_configure.twig A templates/login/twofactor/key.twig A templates/login/twofactor/key_configure.twig A templates/login/twofactor/simple.twig M templates/prefs_second.twig R test/classes/SecondFactorTest.php A test/classes/TwoFactorTest.php Log Message: ----------- Use two-factor authentication instead fo second authentication factor This is probably more widely used naming. Signed-off-by: Michal Čihař <michal@cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/96ba136b4457...5acd64f84d96