Commit Graph

18 Commits (315cf67f6b713e0bfeb99527767e2d65c4d8e11f)

Author SHA1 Message Date
Travis Ralston f37aa30c43
Merge pull request #1756 from uhoreg/cross-signing2
MSC1756: cross-signing devices using a master identity key
5 years ago
Tulir Asokan 79a5663ec3 Fix typos, inline links and move image into tree
Signed-off-by: Tulir Asokan <tulir@maunium.net>
5 years ago
Sorunome 1f786ae6dc
commit image into repo, fix typo 5 years ago
Hubert Chathi 7bad359b0d switch to the 3-key system, and some wording improvements 6 years ago
Hubert Chathi f4fe318a85 update with user-signing and self-signing keys 6 years ago
Andrew Morgan f714aaadd0
Merge pull request #1693 from matrix-org/erikj/state_res_rejections
MSC1693: Specify how to handle rejected events in new state res
6 years ago
Hubert Chathi f3997cd09e graphviz-ify graphs and add some more structure 6 years ago
Erik Johnston 39f7c77971 Add dot for image file 6 years ago
Erik Johnston bc9d205079 Make lines bold 6 years ago
Travis Ralston f7c7a74092 Revert "Merge pull request #1747 from matrix-org/revert-1730-rav/proposal/cs_api_in_login"
This reverts commit e30543a3fe.
6 years ago
Travis Ralston 6dab287708
Revert "MSC1730: Mechanism for redirecting to an alternative server during login" 6 years ago
Erik Johnston a8bd2f32fd Update example 6 years ago
Erik Johnston 6c9a433805 Add example of rejected events getting into state 6 years ago
Richard van der Hoff 275e516f93 Rename svg file to bust cache
github is serving up the old file for some reason
6 years ago
Richard van der Hoff 57421cc59b attempt to clarify MSC1730 6 years ago
Richard van der Hoff 94d83c0483 Update based on feedback
Mostly this is clarification of the problem domain; it also updates some of the
discussion points to reflect my current thinking.
6 years ago
Richard van der Hoff 6f2c2b2c7e MSC1730: Mechanism for redirecting to an alternative server during login 6 years ago
Erik Johnston bbd909d09f State Resolution: Reloaded MSC 6 years ago