Commit Graph

21 Commits (main)

Author SHA1 Message Date
Kegan Dougal d9ec3387c0
MSC4297: State Resolution 2.1 (#4297)
* Placeholder

* Add MSC4297: SR2.1 manually

`git apply` hates me

---------

Co-authored-by: Travis Ralston <travisr@matrix.org>
4 months ago
Matthew Hodgson b1f4ea8c3d
MSC4291: Room IDs as hashes of the create event (#4291)
* msc4291 placeholder

* Add MSC4291: Room IDs as hashes of the create event

Co-authored-by: Travis Ralston <travpc@gmail.com>
Co-authored-by: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Co-authored-by: Matthias Ahouansou <matthias@ahouansou.cz>

* Fix image src

* Review comments

* Add prose on blocking alternative

* Add MSC4311 note

* Update proposals/4291-room-ids-as-hashes.md

Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>

* 11th hour review

---------

Co-authored-by: Kegan Dougal <7190048+kegsay@users.noreply.github.com>
Co-authored-by: Travis Ralston <travpc@gmail.com>
Co-authored-by: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Co-authored-by: Matthias Ahouansou <matthias@ahouansou.cz>
Co-authored-by: Tulir Asokan <tulir@maunium.net>
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Co-authored-by: Travis Ralston <travisr@matrix.org>
4 months ago
Richard van der Hoff ba08c9fe36 notes on and alternatives 5 years ago
Travis Ralston f37aa30c43
Merge pull request #1756 from uhoreg/cross-signing2
MSC1756: cross-signing devices using a master identity key
6 years ago
Tulir Asokan 79a5663ec3 Fix typos, inline links and move image into tree
Signed-off-by: Tulir Asokan <tulir@maunium.net>
6 years ago
Sorunome 1f786ae6dc
commit image into repo, fix typo 6 years ago
Hubert Chathi 7bad359b0d switch to the 3-key system, and some wording improvements 7 years ago
Hubert Chathi f4fe318a85 update with user-signing and self-signing keys 7 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
7 years ago
Hubert Chathi f3997cd09e graphviz-ify graphs and add some more structure 7 years ago
Erik Johnston 39f7c77971 Add dot for image file 7 years ago
Erik Johnston bc9d205079 Make lines bold 7 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.
7 years ago
Travis Ralston 6dab287708
Revert "MSC1730: Mechanism for redirecting to an alternative server during login" 7 years ago
Erik Johnston a8bd2f32fd Update example 7 years ago
Erik Johnston 6c9a433805 Add example of rejected events getting into state 7 years ago
Richard van der Hoff 275e516f93 Rename svg file to bust cache
github is serving up the old file for some reason
7 years ago
Richard van der Hoff 57421cc59b attempt to clarify MSC1730 7 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.
7 years ago
Richard van der Hoff 6f2c2b2c7e MSC1730: Mechanism for redirecting to an alternative server during login 7 years ago
Erik Johnston bbd909d09f State Resolution: Reloaded MSC 7 years ago