From b4038287915ae1c4055f1021ca436b57956c6d68 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 18 Jul 2019 10:46:19 +0100
Subject: [PATCH] Remove edits feature flag from docs and config
Part of https://github.com/vector-im/riot-web/issues/10282
---
config.sample.json | 3 +--
docs/labs.md | 7 -------
electron_app/riot.im/config.json | 3 +--
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/config.sample.json b/config.sample.json
index 55bf12c3..f0b85bbc 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -23,8 +23,7 @@
"features": {
"feature_groups": "labs",
"feature_pinning": "labs",
- "feature_reactions": "labs",
- "feature_message_editing": "labs"
+ "feature_reactions": "labs"
},
"default_federate": true,
"default_theme": "light",
diff --git a/docs/labs.md b/docs/labs.md
index 3d568a2b..65b71b34 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -35,11 +35,4 @@ That's it. Now should see your new counter under the header.
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
index e24d8ecf..27311da2 100644
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -31,8 +31,7 @@
},
"features": {
"feature_lazyloading": "enable",
- "feature_reactions": "enable",
- "feature_message_editing": "enable"
+ "feature_reactions": "enable"
},
"enable_presence_by_hs_url": {
"https://matrix.org": false