From 6e1e5f7ae4dcc5645a5412e17b36e5d95bf4f7c6 Mon Sep 17 00:00:00 2001
From: Florian Orben <florian.orben@gmail.com>
Date: Fri, 13 Nov 2015 23:05:08 +0100
Subject: only show advanced settings section if there are any pre-release
 features

---
 web/react/utils/constants.jsx | 3 ++-
 1 file changed, 2 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 372e15556..31c2b940e 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -398,5 +398,6 @@ export default {
     },
     NotificationPrefs: {
         MENTION: 'mention'
-    }
+    },
+    FeatureTogglePrefix: 'feature_enabled_'
 };
-- 
cgit v1.2.3-1-g7c22


From 61a35066b64085d264fbd049e2a57f70125ca65a Mon Sep 17 00:00:00 2001
From: Florian Orben <florian.orben@gmail.com>
Date: Fri, 27 Nov 2015 23:16:56 +0100
Subject: rename 'featureToggle' to 'isFeatureEnable' and move definition of
 available prerelease-features to constants.jsx

---
 web/react/utils/constants.jsx | 8 +++++++-
 1 file changed, 7 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 31c2b940e..2009e07dd 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -399,5 +399,11 @@ export default {
     NotificationPrefs: {
         MENTION: 'mention'
     },
-    FeatureTogglePrefix: 'feature_enabled_'
+    FeatureTogglePrefix: 'feature_enabled_',
+    PRE_RELEASE_FEATURES: {
+        MARKDOWN_PREVIEW: {
+            label: 'markdown_preview', // github issue: https://github.com/mattermost/platform/pull/1389
+            description: 'Show markdown preview option in message input box'
+        }
+    }
 };
-- 
cgit v1.2.3-1-g7c22

