From 1e4c52a70eab31ecbe50aa642e7f20a90eb913ac Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Mon, 11 Jan 2016 12:35:48 -0500
Subject: Fixed developer errors storing invalid error objects

---
 web/templates/head.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/templates/head.html')

diff --git a/web/templates/head.html b/web/templates/head.html
index 70c94e8ff..08d8726ea 100644
--- a/web/templates/head.html
+++ b/web/templates/head.html
@@ -98,7 +98,7 @@
             });
 
             if (window.mm_config.EnableDeveloper === 'true') {
-                window.ErrorStore.storeLastError('DEVELOPER MODE: A javascript error has occured.  Please use the javascript console to capture and report the error (row: ' + line + ' col: ' + column + ').');
+                window.ErrorStore.storeLastError({message: 'DEVELOPER MODE: A javascript error has occured.  Please use the javascript console to capture and report the error (row: ' + line + ' col: ' + column + ').'});
                 window.ErrorStore.emitChange();
             }
         }
-- 
cgit v1.2.3-1-g7c22


From 9110dd54a15f3d0fcf6f60936e01d816b667b93c Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 4 Jan 2016 12:44:22 -0500
Subject: Added license validation and settings

---
 web/templates/head.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'web/templates/head.html')

diff --git a/web/templates/head.html b/web/templates/head.html
index 08d8726ea..689c69d3c 100644
--- a/web/templates/head.html
+++ b/web/templates/head.html
@@ -46,6 +46,7 @@
 
     <script>
         window.mm_config = {{ .ClientCfg }};
+        window.mm_license = {{ .ClientLicense }};
         window.mm_team = {{ .Team }};
         window.mm_user = {{ .User }};
         window.mm_channel = {{ .Channel }};
-- 
cgit v1.2.3-1-g7c22