Skip to content

Commit

Permalink
Merge pull request #11778 from vector-im/hs/feature_bridge_state
Browse files Browse the repository at this point in the history
Add docs for feature_bridge_state flag
  • Loading branch information
turt2live authored Jan 6, 2020
2 parents 024c019 + 50fe310 commit 83e5eba
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
7 changes: 7 additions & 0 deletions docs/labs.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
3 changes: 2 additions & 1 deletion riot.im/develop/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down

0 comments on commit 83e5eba

Please sign in to comment.