summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-06-28 19:38:19 -0700
committerReed Garmsen <rgarmsen2295@gmail.com>2015-06-28 19:38:19 -0700
commite621950364c93365fad4dbbbb6e94360d2fce809 (patch)
tree757d7c539dda297efe27d30fc3e2143e0e38c56f
parent2cd5f3629ff2410127a8fdc5df92fb16f52fa457 (diff)
downloadchat-e621950364c93365fad4dbbbb6e94360d2fce809.tar.gz
chat-e621950364c93365fad4dbbbb6e94360d2fce809.tar.bz2
chat-e621950364c93365fad4dbbbb6e94360d2fce809.zip
Removed test code
-rw-r--r--config/config.json6
-rw-r--r--web/react/utils/utils.jsx4
2 files changed, 5 insertions, 5 deletions
diff --git a/config/config.json b/config/config.json
index 90ec9540e..e38f1701a 100644
--- a/config/config.json
+++ b/config/config.json
@@ -8,9 +8,9 @@
"FileLocation": ""
},
"ServiceSettings": {
- "SiteName": "Battlehouse",
- "Domain": "battlehouse.com",
- "Mode" : "prod",
+ "SiteName": "Mattermost",
+ "Domain": "xxxxxxmustbefilledin.com",
+ "Mode" : "dev",
"AllowTesting" : false,
"UseSSL": false,
"Port": "8065",
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 128d9d1e7..75c583c8f 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -25,7 +25,7 @@ module.exports.cleanUpUrlable = function(input) {
module.exports.isTestDomain = function() {
- /*if ((/^localhost/).test(window.location.hostname))
+ if ((/^localhost/).test(window.location.hostname))
return true;
if ((/^dockerhost/).test(window.location.hostname))
@@ -44,7 +44,7 @@ module.exports.isTestDomain = function() {
return true;
if ((/^176./).test(window.location.hostname))
- return true;*/
+ return true;
return false;
};