From c197f7996b4bd37eb2109b7c242a6a96fbfd8d7f Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 19 Nov 2019 14:05:51 +0100 Subject: [PATCH 1/2] merge the feature_user_info_panel flag into feature_dm_verification --- docs/labs.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/labs.md b/docs/labs.md index 882f186769..70e12bce3e 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -52,8 +52,8 @@ Exposes a way to access all the integration managers known to Riot. This is an i ## New ways to ignore people (`feature_mjolnir`) -When enabled, a new settings tab appears for users to be able to manage their ban lists. -This is a different kind of ignoring where the ignored user's messages still get rendered, +When enabled, a new settings tab appears for users to be able to manage their ban lists. +This is a different kind of ignoring where the ignored user's messages still get rendered, but are hidden by default. Ban lists are rooms within Matrix, proposed as [MSC2313](https://github.com/matrix-org/matrix-doc/pull/2313). @@ -64,9 +64,7 @@ ban lists. An implementation of [MSC2241](https://github.com/matrix-org/matrix-doc/pull/2241). When enabled, verification might not work with devices which don't support MSC2241. -## New user info panel (`feature_user_info_panel`) - -A new implementation of the user & member info panel, designed to share more code between showing community members & room members. +This also includes a new implementation of the user & member info panel, designed to share more code between showing community members & room members. Built on top of this new panel is also a new UX for verification from the member panel. ## Cross-signing (`feature_cross_signing`) From 6fc742f2295972b34430f5d0db831946c1ffe1b0 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 19 Nov 2019 14:13:45 +0100 Subject: [PATCH 2/2] remove flag from develop config --- riot.im/develop/config.json | 1 - 1 file changed, 1 deletion(-) diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index 05820c339f..1d68c6ca5f 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -19,7 +19,6 @@ "feature_state_counters": "labs", "feature_many_integration_managers": "labs", "feature_mjolnir": "labs", - "feature_user_info_panel": "labs", "feature_dm_verification": "labs", "feature_cross_signing": "labs" },