Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2017-10-31 10:58:33 +0300
committerMichal Čihař <michal@cihar.com>2017-11-01 18:34:18 +0300
commit869131f59cdc075f11008cba79e9a2b67e38fda3 (patch)
tree62bb45ac2e7a8662e360b2a421c3aa0ce244fb34 /composer.json
parenta646d4314e77b909f16ce5a85e4b38dcf0747cde (diff)
Add support for HOTP and TOTP authentication
This supports Google Authenticator and similar applications. Issue #6197 Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json8
1 files changed, 6 insertions, 2 deletions
diff --git a/composer.json b/composer.json
index fd98c5ba3e..3e49d49291 100644
--- a/composer.json
+++ b/composer.json
@@ -57,7 +57,9 @@
"symfony/polyfill-mbstring": "^1.3"
},
"conflict": {
- "tecnickcom/tcpdf": "<6.2"
+ "tecnickcom/tcpdf": "<6.2",
+ "pragmarx/google2fa": "<2.0",
+ "bacon/bacon-qr-code": "<1.0"
},
"suggest": {
"ext-openssl": "Cookie encryption",
@@ -68,7 +70,9 @@
"ext-zip": "For zip import and export",
"ext-gd2": "For image transformations",
"ext-mbstring": "For best performance",
- "tecnickcom/tcpdf": "For PDF support"
+ "tecnickcom/tcpdf": "For PDF support",
+ "pragmarx/google2fa": "For 2FA authentication",
+ "bacon/bacon-qr-code": "For 2FA authentication"
},
"require-dev": {
"phpunit/phpunit": "~4.1",