Merge pull request element-hq#10363 from vector-im/jryans/rm-reactions-edits-flags

jryans · web-flow · commit f4ee5d0a4bd0 · 2019-07-18T14:16:32.000+01:00
Remove edits and reactions feature flags from docs and config
diff --git a/config.sample.json b/config.sample.json
@@ -21,9 +21,7 @@
     "showLabsSettings": false,
     "features": {
         "feature_groups": "labs",
-        "feature_pinning": "labs",
-        "feature_reactions": "labs",
-        "feature_message_editing": "labs"
+        "feature_pinning": "labs"
     },
     "default_federate": true,
     "default_theme": "light",
diff --git a/docs/labs.md b/docs/labs.md
@@ -29,17 +29,4 @@ Once enabled, send a custom state event to a room to set values:
 
 That's it. Now should see your new counter under the header.
 
-## Reactions
-
-`feature_reactions` allows reacting to messages with emoji and displaying
-reactions from other people. This feature is currently under active development,
-and only portions have been implemented so far.
-
-## Message editing
-
-`feature_message_editing` allows editing messages after they have been sent,
-accessible from the reaction/context bar when hovering a message.
-This feature is currently under active development,
-and only portions have been implemented so far.
-
 [#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org
diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json
@@ -30,9 +30,7 @@
         }
     },
     "features": {
-        "feature_lazyloading": "enable",
-        "feature_reactions": "enable",
-        "feature_message_editing": "enable"
+        "feature_lazyloading": "enable"
     },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false
diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
@@ -25,9 +25,7 @@
         "feature_tabbed_settings": "labs",
         "feature_sas": "labs",
         "feature_room_breadcrumbs": "labs",
-        "feature_state_counters": "labs",
-        "feature_reactions": "enable",
-        "feature_message_editing": "enable"
+        "feature_state_counters": "labs"
     },
     "welcomeUserId": "@riot-bot:matrix.org",
     "piwik": {
