From 461e8532a7b82b31964c47b2e69e8350b9c77474 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@spinpunch.com>
Date: Thu, 10 Mar 2016 22:55:16 +0500
Subject: PLT-2138 - Fixing theme sharing box

---
 web/react/utils/constants.jsx | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'web/react/utils/constants.jsx')

diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index daea9f43e..4b1f73b79 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -370,21 +370,6 @@ export default {
             id: 'newMessageSeparator',
             uiName: 'New Message Separator'
         },
-        {
-            group: 'linkAndButtonElements',
-            id: 'linkColor',
-            uiName: 'Link Color'
-        },
-        {
-            group: 'linkAndButtonElements',
-            id: 'buttonBg',
-            uiName: 'Button BG'
-        },
-        {
-            group: 'linkAndButtonElements',
-            id: 'buttonColor',
-            uiName: 'Button Text'
-        },
         {
             group: 'centerChannelElements',
             id: 'mentionHighlightBg',
@@ -417,6 +402,21 @@ export default {
                     uiName: 'Monokai'
                 }
             ]
+        },
+        {
+            group: 'linkAndButtonElements',
+            id: 'linkColor',
+            uiName: 'Link Color'
+        },
+        {
+            group: 'linkAndButtonElements',
+            id: 'buttonBg',
+            uiName: 'Button BG'
+        },
+        {
+            group: 'linkAndButtonElements',
+            id: 'buttonColor',
+            uiName: 'Button Text'
         }
     ],
     DEFAULT_CODE_THEME: 'github',
-- 
cgit v1.2.3-1-g7c22


From e4fed928d9365ba3e096a02e590cd741de4d2cb2 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@spinpunch.com>
Date: Thu, 10 Mar 2016 13:27:34 +0500
Subject: Adding or separator between ldap, username, email, github

Updating code theme name

Updating conditions for login page

updated the 2.0 Dockerfile to include the proper location of mm gzip

Fixing search loading icon on mobile

Adding or separator between ldap, username, email and github
---
 web/react/utils/constants.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'web/react/utils/constants.jsx')

diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 4b1f73b79..3147bbd6a 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -267,7 +267,7 @@ export default {
             buttonColor: '#FFFFFF',
             mentionHighlightBg: '#984063',
             mentionHighlightLink: '#A4FFEB',
-            codeTheme: 'solarized_dark'
+            codeTheme: 'solarized-dark'
         },
         windows10: {
             type: 'Windows Dark',
@@ -386,11 +386,11 @@ export default {
             uiName: 'Code Theme',
             themes: [
                 {
-                    id: 'solarized_dark',
+                    id: 'solarized-dark',
                     uiName: 'Solarized Dark'
                 },
                 {
-                    id: 'solarized_light',
+                    id: 'solarized-light',
                     uiName: 'Solarized Light'
                 },
                 {
-- 
cgit v1.2.3-1-g7c22


From d7cdcf082fab6c0cb7c2fe4bed821bd1a8000e69 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Mon, 8 Feb 2016 07:26:10 -0500
Subject: Convering client to react-router.

---
 web/react/utils/constants.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'web/react/utils/constants.jsx')

diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index daea9f43e..2cff4dbed 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -42,13 +42,15 @@ export default {
 
         RECEIVED_MSG: null,
 
-        RECEIVED_TEAM: null,
+        RECEIVED_MY_TEAM: null,
 
         RECEIVED_CONFIG: null,
         RECEIVED_LOGS: null,
         RECEIVED_SERVER_AUDITS: null,
         RECEIVED_ALL_TEAMS: null,
 
+        RECEIVED_LOCALE: null,
+
         SHOW_SEARCH: null,
 
         TOGGLE_IMPORT_THEME_MODAL: null,
@@ -143,6 +145,7 @@ export default {
     EMAIL_SERVICE: 'email',
     SIGNIN_CHANGE: 'signin_change',
     SIGNIN_VERIFIED: 'verified',
+    SESSION_EXPIRED: 'expired',
     POST_CHUNK_SIZE: 60,
     MAX_POST_CHUNKS: 3,
     POST_FOCUS_CONTEXT_RADIUS: 10,
-- 
cgit v1.2.3-1-g7c22