From d7607df1b162b5d9875bea895371c0ac862773d5 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Sun, 5 Jan 2020 15:42:09 +0000 Subject: [PATCH 1/2] Add feature_bridge_state to config --- riot.im/develop/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index 7e7a4a63c4..f3d5c1da59 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -22,7 +22,8 @@ "feature_dm_verification": "labs", "feature_cross_signing": "labs", "feature_event_indexing": "labs", - "feature_ftue_dms": "labs" + "feature_ftue_dms": "labs", + "feature_bridge_state": "labs" }, "welcomeUserId": "@riot-bot:matrix.org", "piwik": { From 50fe3109c08faf2efb7355368fe0a0df4de533f6 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Sun, 5 Jan 2020 15:47:14 +0000 Subject: [PATCH 2/2] Add feature_bridge_state --- docs/labs.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/labs.md b/docs/labs.md index 9de686b1e3..bce88b0e3b 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -88,3 +88,10 @@ An improved dialog for inviting users. Once finished, this will replace both the DM creation dialog and the 'invite user' dialog. This is a work in progress and as such not all functionality may be present until the feature replaces today's UX. + +## Bridge info tab (`feature_bridge_state`) + +Adds a "Bridge Info" tab to the Room Settings dialog, if a compatible bridge is +present in the room. The Bridge info tab pulls information from the `m.bridge` state event ([MSC2346](https://github.com/matrix-org/matrix-doc/pull/2346)). Since the feature is based upon a MSC, most +bridges are not expected to be compatible, and users should not rely on this +tab as the single source of truth just yet.