gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of git+ssh://github.com/vector-im/riot-web into develop

This commit is contained in:
Matthew Hodgson 2020-01-31 15:22:44 +00:00
parent 87913e6c98 00fa5aad85
commit c3e6a30789
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/labs.md
View File

@ -93,3 +93,8 @@ tab as the single source of truth just yet.
This adds a presence indicator in the room list next to DM rooms where the other This adds a presence indicator in the room list next to DM rooms where the other
person is online. person is online.
## Show padlocks on invite only rooms (`feature_invite_only_padlocks`)
This adds padlocks to room list tiles and room header for invite only rooms.
This feature flag (unlike most) is enabled by default.

1
riot.im/develop/config.json
View File

@ -21,6 +21,7 @@
"feature_mjolnir": "labs", "feature_mjolnir": "labs",
"feature_dm_verification": "labs", "feature_dm_verification": "labs",
"feature_cross_signing": "enable", "feature_cross_signing": "enable",
"feature_invite_only_padlocks": "enable",
"feature_event_indexing": "disable", "feature_event_indexing": "disable",
"feature_bridge_state": "labs", "feature_bridge_state": "labs",
"feature_presence_in_room_list": "labs" "feature_presence_in_room_list": "labs"