Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a59af11ba1dd1a79135e2173cea4fc35ba9a33bf https://github.com/phpmyadmin/phpmyadmin/commit/a59af11ba1dd1a79135e2173cea4... Author: Michal Čihař michal@cihar.com Date: 2017-11-23 (Thu, 23 Nov 2017)

Changed paths: M doc/two_factor.rst

Log Message: ----------- Remove things not needed for u2f

Issue #13787

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 602d07d8aa525e9310eb61af9993693f79c4ba67 https://github.com/phpmyadmin/phpmyadmin/commit/602d07d8aa525e9310eb61af9993... Author: Michal Čihař michal@cihar.com Date: 2017-11-23 (Thu, 23 Nov 2017)

Changed paths: M templates/prefs_second.twig

Log Message: ----------- Fix markup in two factor auth configuration

Issue #13787

Signed-off-by: Michal Čihař michal@cihar.com

Commit: af69e3b7ac32da451725bd491f2d940ab391759e https://github.com/phpmyadmin/phpmyadmin/commit/af69e3b7ac32da451725bd491f2d... Author: Michal Čihař michal@cihar.com Date: 2017-11-23 (Thu, 23 Nov 2017)

Changed paths: M templates/prefs_second.twig

Log Message: ----------- Do not show ui for configuring 2fa if no backends are found

Fixes #13825

Signed-off-by: Michal Čihař michal@cihar.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/81b39e770475...af69e3b7ac32