summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-12-12 15:47:36 -0500
committerJoram Wilander <jwawilander@gmail.com>2015-12-12 15:47:36 -0500
commitb9a4966e7d287ddaa16ccd7d553e2ada13edc289 (patch)
tree5155b0e1e0e049507e25fdd545b77a013124c57e /docker
parentce03fbc6d8176b6d5a903312241a948f59785a04 (diff)
parent87d7db3438d46dcd7d84a65739287e25bbb3644f (diff)
downloadchat-b9a4966e7d287ddaa16ccd7d553e2ada13edc289.tar.gz
chat-b9a4966e7d287ddaa16ccd7d553e2ada13edc289.tar.bz2
chat-b9a4966e7d287ddaa16ccd7d553e2ada13edc289.zip
Merge pull request #1588 from rgarmsen2295/plt-881
PLT-881 Adds Legal and Support Settings to the System Console
Diffstat (limited to 'docker')
-rw-r--r--docker/dev/config_docker.json8
-rw-r--r--docker/local/config_docker.json8
2 files changed, 16 insertions, 0 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json
index a35abb9da..ab1373a44 100644
--- a/docker/dev/config_docker.json
+++ b/docker/dev/config_docker.json
@@ -82,6 +82,14 @@
"ShowEmailAddress": true,
"ShowFullName": true
},
+ "SupportSettings": {
+ "TermsOfServiceLink": "/static/help/terms.html",
+ "PrivacyPolicyLink": "/static/help/privacy.html",
+ "AboutLink": "/static/help/about.html",
+ "HelpLink": "/static/help/help.html",
+ "ReportAProblemLink": "/static/help/report_problem.html",
+ "SupportEmail": "feedback@mattermost.com"
+ },
"GitLabSettings": {
"Enable": false,
"Secret": "",
diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json
index a35abb9da..ab1373a44 100644
--- a/docker/local/config_docker.json
+++ b/docker/local/config_docker.json
@@ -82,6 +82,14 @@
"ShowEmailAddress": true,
"ShowFullName": true
},
+ "SupportSettings": {
+ "TermsOfServiceLink": "/static/help/terms.html",
+ "PrivacyPolicyLink": "/static/help/privacy.html",
+ "AboutLink": "/static/help/about.html",
+ "HelpLink": "/static/help/help.html",
+ "ReportAProblemLink": "/static/help/report_problem.html",
+ "SupportEmail": "feedback@mattermost.com"
+ },
"GitLabSettings": {
"Enable": false,
"Secret": "",