From c4a3118e9f885e92bb9b7d882898e9a51fc3be69 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 2 Aug 2016 16:37:09 -0400
Subject: PLT-3408 Add SiteURL to config.json (#3692)

* PLT-3408 Changed serverside code to get the service's URL from config.json

* PLT-3408 Changed most clientside code to use the SiteURL config setting instead of window.location

* PLT-3408 Changed default SiteURL to be autodetected
---
 i18n/en.json | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'i18n')

diff --git a/i18n/en.json b/i18n/en.json
index 425bffd5f..34c435b82 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2815,6 +2815,10 @@
     "id": "model.config.is_valid.saml_username_attribute.app_error",
     "translation": "Invalid Username attribute. Must be set."
   },
+  {
+    "id": "model.config.is_valid.site_url.app_error",
+    "translation": "Site URL must be a valid URL and start with http:// or https://"
+  },
   {
     "id": "model.config.is_valid.sitename_length.app_error",
     "translation": "Site name must be less than or equal to {{.MaxLength}} characters."
-- 
cgit v1.2.3-1-g7c22