OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #11408 from vector-im/jryans/cross-signing-flag 

Add cross-signing labs flag to develop and document
pull/11426/head
J. Ryan Stinnett 2019-11-18 16:57:22 +00:00 committed by GitHub
parent d23086a6e8 8043aebe1a
commit fe6006f275
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/labs.md
View File

@ -67,3 +67,9 @@ An implementation of [MSC2241](https://github.com/matrix-org/matrix-doc/pull/224
## New user info panel (`feature_user_info_panel`) ## 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. A new implementation of the user & member info panel, designed to share more code between showing community members & room members.
## Cross-signing (`feature_cross_signing`)
Cross-signing ([MSC1756](https://github.com/matrix-org/matrix-doc/pull/1756))
improves the device verification experience by allowing you to verify a user
instead of verifying each of their devices.

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

@ -20,7 +20,8 @@
"feature_many_integration_managers": "labs", "feature_many_integration_managers": "labs",
"feature_mjolnir": "labs", "feature_mjolnir": "labs",
"feature_user_info_panel": "labs", "feature_user_info_panel": "labs",
"feature_dm_verification": "labs" "feature_dm_verification": "labs",
"feature_cross_signing": "labs"
}, },
"welcomeUserId": "@riot-bot:matrix.org", "welcomeUserId": "@riot-bot:matrix.org",
"piwik": { "piwik": {