Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-05 07:23:42 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5498 commits 31 branches 42 tags 32 MiB
Commit graph

891 commits

Author SHA1 Message Date
Travis Ralston a064779ceb Merge pull request #2874 from uhoreg/single_ssss 
MSC2874: Single SSSS
 2021-08-27 19:17:07 +01:00
Travis Ralston 39e82409ab Merge pull request #2184 from ananace/html_details 
MSC2184: Allow the use of the HTML <details> tag
 2021-08-27 19:17:07 +01:00
Travis Ralston fa71522c09 Merge pull request #2858 from matrix-org/t3chguy/msc/multi-sso 
MSC2858: Multiple SSO Identity Providers
 2021-08-27 19:17:07 +01:00
Richard van der Hoff a8a7acce1e update UIA 2021-03-09 18:10:17 +00:00
Richard van der Hoff 49f7624d55 update brand descriptions 2021-03-09 18:07:37 +00:00
Richard van der Hoff d5166ebc1a
Update proposals/2858-Multiple-SSO-Identity-Providers.md 2021-03-09 18:04:19 +00:00
Richard van der Hoff 7871da7565
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
 2021-03-09 16:53:16 +00:00
Richard van der Hoff 1ba0c39b14 Change the brand identifiers again 2021-03-09 14:37:30 +00:00
Richard van der Hoff 178cbe1c3a
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-03-03 18:50:27 +00:00
Richard van der Hoff a596efdf8b Get rid of the registry for now 
it should just be a proposal. We can add the registry later.
 2021-03-03 11:51:25 +00:00
Richard van der Hoff 62cc76f28b Move sequence diagram into doc 2021-03-03 11:33:03 +00:00
Richard van der Hoff 2d4da148d8
more fix markdown 2021-03-02 19:19:45 +00:00
Richard van der Hoff dce9c9f09a Move the idp brand assignments out to a registry 2021-03-02 19:14:11 +00:00
Michael Telatynski ba3e204a48
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
 2021-03-01 22:25:45 +00:00
Richard van der Hoff 6badb3b6d8 Notes on OAuth2 and unknown idps 2021-03-01 19:19:41 +00:00
Andrew Morgan 2acc0a697b Clarify prose 2021-02-25 18:59:38 +00:00
Travis Ralston fadee276d2 Alter to reserve v7 instead of declare v7 2021-02-22 11:56:53 -07:00
Andrew Morgan 97109d4268 Remove MSC2175, MSC2174 due to lack of implementation 2021-02-18 15:49:51 +00:00
Hubert Chathi 356d1fe3e3 add example 2021-02-11 16:48:32 -05:00
Andrew Morgan 336e5a2c7a
v6 -> v7 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-02-08 18:04:48 +00:00
Andrew Morgan 1f07f0dc9a MSC2998 2021-02-08 11:50:56 +00:00
Andrew Morgan 3735def108 Define room version 7 2021-02-08 11:50:53 +00:00
Travis Ralston 315cf67f6b
Merge pull request #2366 from uhoreg/key_verification_accept 
MSC2366: Key verification flow additions: m.key.verification.ready and m.key.verification.done
 2021-01-31 10:06:36 -07:00
Richard van der Hoff ba08c9fe36 notes on and alternatives 2021-01-27 16:48:32 +00:00
Richard van der Hoff 84346055e9
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-01-27 15:22:03 +00:00
Richard van der Hoff 09d41c59b9 add 'brand' 2021-01-27 13:00:12 +00:00
Richard van der Hoff 0c18f83636 grammar clarifications 2021-01-27 12:45:11 +00:00
Richard van der Hoff 277ff682d6 Formatting tweaks 2021-01-27 12:43:26 +00:00
Hubert Chathi d9edb3fdf3
Apply suggestions from code review 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2021-01-19 12:59:59 -05:00
Michael Telatynski 1d90cacf6e Merge branch 't3chguy/msc/multi-sso' of github.com:matrix-org/matrix-doc into t3chguy/msc/multi-sso 2021-01-19 13:53:10 +00:00
Michael Telatynski 85ccf93c6a Remove UIA stuff 2021-01-19 13:52:57 +00:00
Michael Telatynski 8be6540eaf
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2021-01-19 13:43:49 +00:00
Michael Telatynski c7063a4eec Iterate PR based on feedback 2021-01-18 09:30:07 +00:00
Travis Ralston 5800dcb654
Merge pull request #2844 from matrix-org/travis/msc/global-versioning 
MSC2844: Global version number for the whole spec
 2021-01-17 12:58:42 -07:00
Travis Ralston 46d843e8fa Make deprecation industry standard 2021-01-12 09:52:50 -07:00
Travis Ralston 124c8d43d3
Apply suggestions from code review 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2021-01-12 09:22:06 -07:00
Travis Ralston 22acbea0ed
Apply suggestions from code review 
Co-authored-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
 2021-01-09 20:38:58 -07:00
Travis Ralston 7b4e702a69 Remove patch versions, policy stuff, etc 2021-01-09 20:33:20 -07:00
Hubert Chathi 7678884376 clarifications to cross-signing MSC 2021-01-08 17:48:03 -05:00
Travis Ralston b07618cc3f Make clarifications to the spec 2020-12-15 09:49:27 -07:00
Travis Ralston 8d6642aaa7 Merge branch 'master' into travis/msc/global-versioning 2020-12-15 09:34:59 -07:00
Travis Ralston 6ccc548912 Revert "Merge branch 'travis/msc/1337-joined-rooms'" 
This reverts commit 0961c7b0f7.
 2020-12-07 14:34:10 -07:00
Travis Ralston 942e8b36e4 Convert to markdown verbatim 2020-12-04 10:38:14 -07:00
Michael Telatynski 153c55788d Add more explanation 2020-11-26 10:47:05 +00:00
Travis Ralston bce1bf3210
Merge pull request #1544 from uhoreg/qr_key_verification 
MSC1544: Key verification using QR codes
 2020-11-25 13:26:28 -07:00
Hubert Chathi 11d6e42ee1 use MSC number 2020-11-23 12:18:44 -05:00
Hubert Chathi f7a397dc90 add proposal for Single SSSS 2020-11-23 12:14:22 -05:00
Travis Ralston 11daaf6ea9 Add a small note about widgets 2020-11-22 18:58:36 -07:00
Travis Ralston 8cc3d44c2a Generally wording changes; Change deprecation 2020-11-22 01:22:05 -07:00
Travis Ralston 09c569f1a7 Cover a case of no-op versions 2020-11-22 01:03:54 -07:00