Merge branch 'develop' into travis/remove-presence

2018-04-11 15:17:28 -06:00
parent 99d3045b4f 979452628f
commit fe2cbc584d
246 changed files with 16884 additions and 4954 deletions
@@ -76,6 +76,12 @@ export const SETTINGS = {
    //     // level is always appended to the end.
    //     supportedLevelsAreOrdered: false,
    // },
+    "feature_rich_quoting": {
+        isFeature: true,
+        displayName: _td("Message Replies"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
    "feature_pinning": {
        isFeature: true,
        displayName: _td("Message Pinning"),
@@ -88,6 +94,12 @@ export const SETTINGS = {
        supportedLevels: LEVELS_FEATURE,
        default: false,
    },
+    "feature_sticker_messages": {
+        isFeature: true,
+        displayName: _td("Sticker Messages"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
    "MessageComposerInput.dontSuggestEmoji": {
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
        displayName: _td('Disable Emoji suggestions while typing'),
@@ -176,6 +188,11 @@ export const SETTINGS = {
        displayName: _td('Mirror local video feed'),
        default: false,
    },
+    "TagPanel.disableTagPanel": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Disable Community Filter Panel'),
+        default: false,
+    },
    "theme": {
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
        default: "light",