summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-10-30 10:57:25 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-10-30 10:57:25 -0400
commit256be4c14dfd99fc923d497cc6d7dfe3f4e8e3c5 (patch)
treef85d6a4707eaab904694aa4fc42aca917f03fdc4 /docker
parentc2cd58a33f52c6567e39d8ba563425dc06916d41 (diff)
parentbedf85a122359a70cbb21be1219a5d566466273e (diff)
downloadchat-256be4c14dfd99fc923d497cc6d7dfe3f4e8e3c5.tar.gz
chat-256be4c14dfd99fc923d497cc6d7dfe3f4e8e3c5.tar.bz2
chat-256be4c14dfd99fc923d497cc6d7dfe3f4e8e3c5.zip
Merge pull request #1211 from mattermost/PLT-340
PLT-340 allow team directory and open invites
Diffstat (limited to 'docker')
-rw-r--r--docker/dev/config_docker.json4
-rw-r--r--docker/local/config_docker.json4
2 files changed, 6 insertions, 2 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json
index 00729395e..80e6ab14e 100644
--- a/docker/dev/config_docker.json
+++ b/docker/dev/config_docker.json
@@ -17,7 +17,9 @@
"MaxUsersPerTeam": 50,
"EnableTeamCreation": true,
"EnableUserCreation": true,
- "RestrictCreationToDomains": ""
+ "RestrictCreationToDomains": "",
+ "RestrictTeamNames": true,
+ "EnableTeamListing": false
},
"SqlSettings": {
"DriverName": "mysql",
diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json
index 00729395e..80e6ab14e 100644
--- a/docker/local/config_docker.json
+++ b/docker/local/config_docker.json
@@ -17,7 +17,9 @@
"MaxUsersPerTeam": 50,
"EnableTeamCreation": true,
"EnableUserCreation": true,
- "RestrictCreationToDomains": ""
+ "RestrictCreationToDomains": "",
+ "RestrictTeamNames": true,
+ "EnableTeamListing": false
},
"SqlSettings": {
"DriverName": "mysql",