Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3054999afe82e2bba08547dfc229550234e2c109 https://github.com/phpmyadmin/phpmyadmin/commit/3054999afe82e2bba08547dfc229... Author: Raman Tehlan ramantehlan@gmail.com Date: 2018-05-03 (Thu, 03 May 2018)

Changed paths: M libraries/classes/Plugins/TwoFactor/Application.php M templates/login/twofactor/application_configure.twig

Log Message: ----------- Display the secret for 2FA - #14128 (#14154)

* 2FA Secret added * 2FA Secret Displayed

Fix #14128

Signed-off-by: Raman Tehlan ramantehlan@gmail.com Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com (cherry picked from commit 8dbae11f6f7ffb8a73f2c9c60976fe6f9ee0d844) Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com

Commit: e7a6ff8a0e614de113e88f81244ceada11bdadfc https://github.com/phpmyadmin/phpmyadmin/commit/e7a6ff8a0e614de113e88f81244c... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-05-03 (Thu, 03 May 2018)

Changed paths: M libraries/classes/Plugins/TwoFactor/Application.php M templates/login/twofactor/application_configure.twig

Log Message: ----------- Remove duplicated input in application_configure.twig

Some coding style fixes.

Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com

Commit: f65f59c8e802b097c41380d8b83b52cd766077d5 https://github.com/phpmyadmin/phpmyadmin/commit/f65f59c8e802b097c41380d8b83b... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-05-03 (Thu, 03 May 2018)

Changed paths: M libraries/classes/Plugins/TwoFactor/Application.php M templates/login/twofactor/application_configure.twig

Log Message: ----------- Merge branch 'QA_4_8'

Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8dbae11f6f7f...f65f59c8e802 **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

Functionality will be removed from GitHub.com on January 31st, 2019.