Commit Graph

891 Commits (e0dd138d40da5d9e6f4639bce288861b3cb6cfbf)

Author SHA1 Message Date
Travis Ralston e0dd138d40
Merge pull request #2874 from uhoreg/single_ssss
MSC2874: Single SSSS
4 years ago
Travis Ralston f0170f2f08
Merge pull request #2184 from ananace/html_details
MSC2184: Allow the use of the HTML <details> tag
4 years ago
Travis Ralston 18ddc03628
Merge pull request #2858 from matrix-org/t3chguy/msc/multi-sso
MSC2858: Multiple SSO Identity Providers
4 years ago
Richard van der Hoff a8a7acce1e update UIA 4 years ago
Richard van der Hoff 49f7624d55 update brand descriptions 4 years ago
Richard van der Hoff d5166ebc1a
Update proposals/2858-Multiple-SSO-Identity-Providers.md 4 years ago
Richard van der Hoff 7871da7565
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
4 years ago
Richard van der Hoff 1ba0c39b14 Change the brand identifiers again 4 years ago
Richard van der Hoff 178cbe1c3a
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Travis Ralston <travpc@gmail.com>
4 years ago
Richard van der Hoff a596efdf8b Get rid of the registry for now
it should just be a proposal. We can add the registry later.
4 years ago
Richard van der Hoff 62cc76f28b Move sequence diagram into doc 4 years ago
Richard van der Hoff 2d4da148d8
more fix markdown 4 years ago
Richard van der Hoff dce9c9f09a Move the idp `brand` assignments out to a registry 4 years ago
Michael Telatynski ba3e204a48
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
4 years ago
Richard van der Hoff 6badb3b6d8 Notes on OAuth2 and unknown idps 4 years ago
Andrew Morgan 2acc0a697b Clarify prose 4 years ago
Travis Ralston fadee276d2 Alter to reserve v7 instead of declare v7 4 years ago
Andrew Morgan 97109d4268 Remove MSC2175, MSC2174 due to lack of implementation 4 years ago
Hubert Chathi 356d1fe3e3 add example 4 years ago
Andrew Morgan 336e5a2c7a
v6 -> v7
Co-authored-by: Travis Ralston <travpc@gmail.com>
4 years ago
Andrew Morgan 1f07f0dc9a MSC2998 4 years ago
Andrew Morgan 3735def108 Define room version 7 4 years ago
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
4 years ago
Richard van der Hoff ba08c9fe36 notes on and alternatives 4 years ago
Richard van der Hoff 84346055e9
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
4 years ago
Richard van der Hoff 09d41c59b9 add 'brand' 4 years ago
Richard van der Hoff 0c18f83636 grammar clarifications 4 years ago
Richard van der Hoff 277ff682d6 Formatting tweaks 4 years ago
Hubert Chathi d9edb3fdf3
Apply suggestions from code review
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
4 years ago
Michael Telatynski 1d90cacf6e Merge branch 't3chguy/msc/multi-sso' of github.com:matrix-org/matrix-doc into t3chguy/msc/multi-sso 4 years ago
Michael Telatynski 85ccf93c6a Remove UIA stuff 4 years ago
Michael Telatynski 8be6540eaf
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
4 years ago
Michael Telatynski c7063a4eec Iterate PR based on feedback 4 years ago
Travis Ralston 5800dcb654
Merge pull request #2844 from matrix-org/travis/msc/global-versioning
MSC2844: Global version number for the whole spec
4 years ago
Travis Ralston 46d843e8fa Make deprecation industry standard 4 years ago
Travis Ralston 124c8d43d3
Apply suggestions from code review
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
4 years ago
Travis Ralston 22acbea0ed
Apply suggestions from code review
Co-authored-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
4 years ago
Travis Ralston 7b4e702a69 Remove patch versions, policy stuff, etc 4 years ago
Hubert Chathi 7678884376 clarifications to cross-signing MSC 4 years ago
Travis Ralston b07618cc3f Make clarifications to the spec 4 years ago
Travis Ralston 8d6642aaa7 Merge branch 'master' into travis/msc/global-versioning 4 years ago
Travis Ralston 6ccc548912 Revert "Merge branch 'travis/msc/1337-joined-rooms'"
This reverts commit 0961c7b0f7.
4 years ago
Travis Ralston 942e8b36e4 Convert to markdown verbatim 4 years ago
Michael Telatynski 153c55788d Add more explanation 4 years ago
Travis Ralston bce1bf3210
Merge pull request #1544 from uhoreg/qr_key_verification
MSC1544: Key verification using QR codes
4 years ago
Hubert Chathi 11d6e42ee1 use MSC number 4 years ago
Hubert Chathi f7a397dc90 add proposal for Single SSSS 4 years ago
Travis Ralston 11daaf6ea9 Add a small note about widgets 4 years ago
Travis Ralston 8cc3d44c2a Generally wording changes; Change deprecation 4 years ago
Travis Ralston 09c569f1a7 Cover a case of no-op versions 4 years ago