From 7b8ab047edc845ad12ed0959adda9891f8fb73e5 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 25 Nov 2019 14:29:28 +0000 Subject: [PATCH 1/2] Clarify that cross-signing is in development Expand on the development state of cross-signing in the labs docs. Fixes https://github.com/vector-im/riot-web/issues/11492 --- docs/labs.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/labs.md b/docs/labs.md index 70e12bce3e..12a6e7d4e2 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -66,8 +66,11 @@ An implementation of [MSC2241](https://github.com/matrix-org/matrix-doc/pull/224 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`) +## Cross-signing (in development) (`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. + +This feature is still in development and will be landing in several chunks in +the coming weeks. From 84df4785f85edf4a99e07e857d772c584b339955 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 25 Nov 2019 16:25:19 +0000 Subject: [PATCH 2/2] Remove timeframe --- docs/labs.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/labs.md b/docs/labs.md index 12a6e7d4e2..8889f929a0 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -72,5 +72,4 @@ 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. -This feature is still in development and will be landing in several chunks in -the coming weeks. +This feature is still in development and will be landing in several chunks.