Commit graph

82 commits

Author SHA1 Message Date
Travis Ralston b85f7bb248 Add room version upgrades
Implements https://github.com/matrix-org/matrix-doc/issues/1501
2019-01-09 17:02:09 -07:00
Andrew Morgan ec97e1eedb
Merge pull request #1753 from matrix-org/rav/proposal/cs_capabilities
MSC1753: client-server capabilities API
2019-01-09 14:10:37 +00:00
Matthew Hodgson bd72ecfa58 oops, wrong branch 2019-01-07 02:43:21 +00:00
Matthew Hodgson c5de71843a MSC1779: Open Governance for Matrix.org 2019-01-07 02:42:03 +00:00
Travis Ralston ca2e9260d4
Update proposals/1753-capabilities.md
r0/versions isn't a thing

Co-Authored-By: richvdh <1389908+richvdh@users.noreply.github.com>
2019-01-03 17:41:06 +00:00
Travis Ralston 4019678661
Update proposals/1753-capabilities.md
r0/versions isn't a thing

Co-Authored-By: richvdh <1389908+richvdh@users.noreply.github.com>
2019-01-03 17:40:57 +00:00
Travis Ralston 962565b159
Update proposals/1753-capabilities.md
r0/versions isn't a thing

Co-Authored-By: richvdh <1389908+richvdh@users.noreply.github.com>
2019-01-03 17:40:49 +00:00
Richard van der Hoff 7f5832044c Fix typos per review 2019-01-02 09:55:14 +00:00
Andrew Morgan d9135ef902
Merge pull request #1598 from matrix-org/rav/proposals/id_grammar
MSC 1597: Better spec for matrix identifiers
2018-12-23 17:07:11 +01:00
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
2018-12-23 17:06:34 +01:00
Richard van der Hoff 82f3b8a95a switch to GET 2018-12-21 17:47:52 +00:00
Richard van der Hoff 68ac2172ba Give examples of applications 2018-12-21 17:39:52 +00:00
Erik Johnston 8fb2bd2927 Fix typo 2018-12-18 09:47:32 +00:00
Erik Johnston 23c7533f8d Room v2 proposal 2018-12-17 15:35:54 +00:00
Erik Johnston 39f7c77971 Add dot for image file 2018-12-14 13:09:25 +00:00
Richard van der Hoff b95d5724a4 Add suggestion of returning a 401 for non-/login requests 2018-12-14 12:03:19 +00:00
Erik Johnston 48d271e58c Clarifications 2018-12-14 11:22:32 +00:00
Erik Johnston 463c71af82 Add a note about the examples 2018-12-13 11:31:39 +00:00
Erik Johnston b695eb0d17 Clarify example 2018-12-13 11:20:19 +00:00
Erik Johnston bc9d205079 Make lines bold 2018-12-13 11:13:14 +00:00
Richard van der Hoff 0e156faaf1 MSC1753: client-server capabilities API 2018-12-12 21:43:40 +00:00
Travis Ralston f7c7a74092 Revert "Merge pull request #1747 from matrix-org/revert-1730-rav/proposal/cs_api_in_login"
This reverts commit e30543a3fe.
2018-12-11 15:52:06 -07:00
Travis Ralston 6dab287708
Revert "MSC1730: Mechanism for redirecting to an alternative server during login" 2018-12-11 15:49:24 -07:00
Travis Ralston a4bc79025b
Merge pull request #1730 from matrix-org/rav/proposal/cs_api_in_login
MSC1730: Mechanism for redirecting to an alternative server during login
2018-12-11 14:25:03 -07:00
Erik Johnston a8bd2f32fd Update example 2018-12-11 10:37:31 +00:00
Erik Johnston 8a3e7b751c Add missing apostrophe 2018-12-11 10:33:02 +00:00
Richard van der Hoff 7782781442
Update wording to be betterer
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:13:45 +00:00
Richard van der Hoff 612d8a66ef
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:12:52 +00:00
Richard van der Hoff f06455479d
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:12:39 +00:00
Richard van der Hoff 539ca4cf15
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:12:29 +00:00
Richard van der Hoff c581c6132e
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:12:18 +00:00
Richard van der Hoff eaaf36edf7
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:11:55 +00:00
Erik Johnston 6c9a433805 Add example of rejected events getting into state 2018-12-10 16:27:45 +00:00
Erik Johnston 55ebf7dc32
MSC 1466 - Soft Logout (#1467) 2018-12-10 09:59:15 +00:00
Richard van der Hoff 6f7b3198fb fix list which got lost in merge 2018-12-06 16:36:41 +00:00
Richard van der Hoff 275e516f93 Rename svg file to bust cache
github is serving up the old file for some reason
2018-12-06 16:32:55 +00:00
Richard van der Hoff a9c4ea690d Merge branch 'rav/msc1730/work' into rav/proposal/cs_api_in_login 2018-12-06 16:29:16 +00:00
Richard van der Hoff 9c9c5a8c65 more alternatives 2018-12-06 16:06:17 +00:00
Richard van der Hoff 57421cc59b attempt to clarify MSC1730 2018-12-06 12:48:12 +00:00
Richard van der Hoff 6fa754c447
Tradeoffs->rejected solutions
because apparently this was somehow confusing
2018-11-26 23:37:10 +00:00
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.
2018-11-26 18:36:07 +00:00
Richard van der Hoff a39189c08b Update proposal
Notes on problems, workaround, and another alternative
2018-11-24 00:28:10 +00:00
Richard van der Hoff 6f2c2b2c7e MSC1730: Mechanism for redirecting to an alternative server during login 2018-11-23 12:51:45 +00:00
Richard van der Hoff b5a82a5eb1
no need to rename ticket endpoint 2018-11-22 23:04:43 +00:00
Richard van der Hoff 0c4b09305e Proposal to rename m.login.cas to m.login.sso 2018-11-15 12:34:53 +00:00
Hubert Chathi 58091fa3fe make heading level for "Security considerations" match the other headings
as much as I like that "Security considerations" gets to be bigger than the
other headers, we should probably make it consistent
2018-11-13 11:58:31 -05:00
Erik Johnston a80ff2f69f Don't use rejected auth events 2018-11-05 09:45:11 +00:00
Erik Johnston b8a8d132b2 Note why convergence is desirable 2018-11-01 11:41:38 +00:00
Erik Johnston a6aab378f5 Typo 2018-10-31 15:26:54 +00:00
Erik Johnston 1f1ba28629 ACTUALLY! Let's just accept rejected events, because what's the worst that can happen?! 2018-10-31 15:26:12 +00:00