Fixed #6834 and #6402 - use inline QR code generation for 2FA (#6840)

* Fixed #6834 and #6402 - use inline QR code generation for * Update auth controllers to use translations * Updated composer lock * Added comments * Moar comments * Typo
2019-03-20 01:24:31 -07:00
parent 1451b4f45d
commit da015ec4a8
6 changed files with 267 additions and 100 deletions
@@ -27,7 +27,8 @@
    "patchwork/utf8": "~1.2",
    "phpdocumentor/reflection-docblock": "3.2.2",
    "phpspec/prophecy": "1.6.2",
-    "pragmarx/google2fa": "^1.0",
+    "pragmarx/google2fa": "^5.0",
+    "pragmarx/google2fa-laravel": "^0.3.0",
    "predis/predis": "^1.1",
    "rollbar/rollbar-laravel": "2.4.1",
    "schuppo/password-strength": "~1.5",