Merge branch 'develop' into bwindels/roomlistlag

2019-02-08 16:38:57 +00:00
parent d2dd1bae13 82a7ecbf25
commit 6f9aa9c9b9
22 changed files with 245 additions and 275 deletions
@@ -190,10 +190,13 @@ const LeftPanel = React.createClass({

        const tagPanelEnabled = SettingsStore.getValue("TagPanel.enableTagPanel");
        let tagPanelContainer;
+
+        const isCustomTagsEnabled = SettingsStore.isFeatureEnabled("feature_custom_tags");
+
        if (tagPanelEnabled) {
            tagPanelContainer = (<div className="mx_LeftPanel_tagPanelContainer">
                <TagPanel />
-                <CustomRoomTagPanel />
+                { isCustomTagsEnabled ? <CustomRoomTagPanel /> : undefined }
                <TagPanelButtons />
            </div>);
        }