summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-02-03 07:33:43 -0500
committerJoram Wilander <jwawilander@gmail.com>2016-02-03 07:33:43 -0500
commit4a09adeb391b23c7e850fec96a2e8a731b70d755 (patch)
treeca9cc2410dc17de823d923c9e0ff74fea16d2a82 /docker
parentd31ae207389b7402debbcaa40bb691e86023f1ba (diff)
parentb013f02209c7c128a35d1c54f2d4a7d6a9701f72 (diff)
downloadchat-4a09adeb391b23c7e850fec96a2e8a731b70d755.tar.gz
chat-4a09adeb391b23c7e850fec96a2e8a731b70d755.tar.bz2
chat-4a09adeb391b23c7e850fec96a2e8a731b70d755.zip
Merge pull request #1991 from rgarmsen2295/plt-976
PLT-976 Adds ability to sign in with username
Diffstat (limited to 'docker')
-rw-r--r--docker/dev/config_docker.json2
-rw-r--r--docker/local/config_docker.json2
2 files changed, 4 insertions, 0 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json
index 1aa2ee843..80b99b66d 100644
--- a/docker/dev/config_docker.json
+++ b/docker/dev/config_docker.json
@@ -66,6 +66,8 @@
},
"EmailSettings": {
"EnableSignUpWithEmail": true,
+ "EnableSignInWithEmail": true,
+ "EnableSignInWithUsername": false,
"SendEmailNotifications": false,
"RequireEmailVerification": false,
"FeedbackName": "",
diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json
index 1aa2ee843..80b99b66d 100644
--- a/docker/local/config_docker.json
+++ b/docker/local/config_docker.json
@@ -66,6 +66,8 @@
},
"EmailSettings": {
"EnableSignUpWithEmail": true,
+ "EnableSignInWithEmail": true,
+ "EnableSignInWithUsername": false,
"SendEmailNotifications": false,
"RequireEmailVerification": false,
"FeedbackName": "",