diff options
author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-28 19:25:39 -0700 |
---|---|---|
committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-28 19:36:41 -0700 |
commit | 2cd5f3629ff2410127a8fdc5df92fb16f52fa457 (patch) | |
tree | c31c1393e25aa141d1558268d49c5995d523ad2d | |
parent | bf8511fa479e69c0985a2ff153bde953454e1bf2 (diff) | |
download | chat-2cd5f3629ff2410127a8fdc5df92fb16f52fa457.tar.gz chat-2cd5f3629ff2410127a8fdc5df92fb16f52fa457.tar.bz2 chat-2cd5f3629ff2410127a8fdc5df92fb16f52fa457.zip |
Fixed typo in team domain look-up page
-rw-r--r-- | config/config.json | 6 | ||||
-rw-r--r-- | web/react/components/login.jsx | 2 | ||||
-rw-r--r-- | web/react/utils/utils.jsx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/config/config.json b/config/config.json index e38f1701a..90ec9540e 100644 --- a/config/config.json +++ b/config/config.json @@ -8,9 +8,9 @@ "FileLocation": "" }, "ServiceSettings": { - "SiteName": "Mattermost", - "Domain": "xxxxxxmustbefilledin.com", - "Mode" : "dev", + "SiteName": "Battlehouse", + "Domain": "battlehouse.com", + "Mode" : "prod", "AllowTesting" : false, "UseSSL": false, "Port": "8065", diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 85df5f797..3b6f96c2d 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -37,7 +37,7 @@ var FindTeamDomain = React.createClass({ window.location.href = window.location.protocol + "//" + domain + "." + utils.getDomainWithOutSub(); } else { - this.state.server_error = "We couldn't find your " + strings.TeamPlural + "."; + this.state.server_error = "We couldn't find your " + strings.Team + "."; this.setState(this.state); } }.bind(this), diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 75c583c8f..128d9d1e7 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; }; |