Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-25 08:33:45 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3990 commits 28 branches 42 tags 33 MiB
Commit graph

182 commits

Author SHA1 Message Date
Travis Ralston 2c3ba0b135
Merge pull request #1813 from matrix-org/erikj/make_membership_room_ver 
MSC 1813 - Federation Make Membership Room Version
 2019-01-29 10:17:48 -07:00
Richard van der Hoff de57d3950f
Relax the requirement for a content-type on .well-known (#1824) 
The main reason for this is that Apache etc won't stick a content-type on by
default, because they don't know it's JSON, so requiring it seems like it will
require unnecessary hoop-humping for everyone who wants to use a .well-known.
 2019-01-29 14:46:27 +00:00
Neil Johnson 9f517f33ce
Create 1819-remove-presence-lists.md 2019-01-28 17:59:17 +00:00
Travis Ralston 577edeb53b Say that !stable == unstable 2019-01-25 09:27:23 -07:00
Travis Ralston 052d68d83d
Merge pull request #1791 from matrix-org/travis/spec/rver-upgrades 
Add room version upgrades
 2019-01-23 19:04:24 -07:00
Travis Ralston 50eba23669 Update MSC to match how room versions work 
As per 1773.
 2019-01-22 18:24:04 -07:00
Erik Johnston 3ec3adbc24 Proposal for add room_version to make_* fed APIs 2019-01-22 10:55:27 +00:00
Travis Ralston f308871ed9
Merge pull request #1794 from matrix-org/erikj/fed_invite_v2 
MSC 1794 - Federation v2 Invite API
 2019-01-21 07:59:07 -07:00
Travis Ralston 853d7ede30 Clarify the categories and the interaction between them 2019-01-17 09:41:24 -07:00
Travis Ralston 5da17d0114 Remove recommendation for clients to respect the spec over the server 2019-01-17 09:41:11 -07:00
Travis Ralston 7fee7373ea Proposal for advertising capable room versions to clients 2019-01-16 17:32:07 -07:00
Richard van der Hoff ebf37178b5
Update proposals/1794-federation-v2-invites.md 
Co-Authored-By: erikjohnston <erikj@jki.re>
 2019-01-14 15:53:23 +00:00
Travis Ralston fe4928c6a1
Merge pull request #1708 from matrix-org/rav/proposal/well-known-for-federation 
MSC1708: .well-known support for server name resolution
 2019-01-14 07:48:05 -07:00
Erik Johnston b90ee6baab 'invite_room_state' should be an array 2019-01-14 14:21:20 +00:00
Hubert Chathi c88c9c2941
Update proposals/1794-federation-v2-invites.md 
Co-Authored-By: erikjohnston <erikj@jki.re>
 2019-01-14 14:19:58 +00:00
Travis Ralston 87bb1a6a79
Merge pull request #1711 from matrix-org/rav/proposal/x509-for-federation 
MSC1711: X.509 certificate verification for federation connections
 2019-01-13 08:04:03 -07:00
Erik Johnston 2109314c52
Apply suggestions from code review 
Co-Authored-By: erikjohnston <erikj@jki.re>
 2019-01-11 14:34:31 +00:00
Travis Ralston 576aa22880
Merge pull request #1704 from matrix-org/travis/msc/matrix.to-permalinks 
MSC1704: Adding ?via= to matrix.to permalinks to help with routing
 2019-01-10 11:22:07 -07:00
Richard van der Hoff afa0caee93 remove lying footnote 2019-01-10 18:16:39 +00:00
Erik Johnston b0adfc67d8 MSC 1794 - Federation v2 Invite API 2019-01-10 12:20:29 +00:00
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
Richard van der Hoff c10394d03f Clarifications thanks to @uhoreg 2019-01-09 11:26:14 +00:00
Hubert Chathi 09a547d67e add some cancellation codes, and mention existing verification MSCs 2019-01-08 17:45:13 -05:00
Hubert Chathi ff0b9eac76 add ability to start verifications that happen in two stages 2019-01-08 16:11:15 -05:00
Hubert Chathi c02ecb58ae mark which fields are required 2019-01-08 16:11:00 -05:00
Richard van der Hoff b541c2a247 more formatting 2019-01-08 12:54:52 +00:00
Richard van der Hoff 5812450299 spec that we follow redirects 2019-01-08 12:51:23 +00:00
Richard van der Hoff f1ebbc358b document dismissed options 2019-01-08 12:51:23 +00:00
Richard van der Hoff fb171cadf4 formatting fix 2019-01-08 12:51:23 +00:00
Richard van der Hoff 12fc50cea7 clarify that a whitelist is useful for cjdns too 2019-01-08 11:03:36 +00:00
Richard van der Hoff f33a540e6d Do a SRV lookup before .well-known lookup 
also other clarifications and corrections.
 2019-01-08 00:25:06 +00:00
Richard van der Hoff 74b2db7937 Remove .well-known section 
This really belongs in MSC1708.
 2019-01-07 21:39:02 +00:00
Richard van der Hoff 367f61f14a cleanups and clarifications 2019-01-07 21:38:41 +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
Richard van der Hoff e0fa00fc34 Some HSes use more than one notary 2019-01-03 18:21:05 +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 2b58052555 add note about re-requesting megolm keys 2018-11-14 10:28:26 -05:00
Hubert Chathi 495df02da6 we don't actually know which session got stuck, so rate-limit by device 2018-11-14 10:19:11 -05:00
Hubert Chathi d0bfdc13af rename to match MSC number 2018-11-13 22:03:07 -05:00
Hubert Chathi b535226d40 initial work on documenting olm unwedging 2018-11-13 22:00:42 -05: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
Hubert Chathi ec2e02e8b5 rename to match MSC number 2018-11-13 11:45:18 -05:00
Hubert Chathi 8521c2d696 initial proposal for key verification methods 2018-11-13 11:31:41 -05:00
Richard van der Hoff e789eb186a link to MSC1711 2018-11-12 14:02:53 +00:00
Matthew Hodgson b1e79ac7ab
Update 1708-well-known-for-federation.md 2018-11-09 11:22:22 +00:00
Richard van der Hoff bc29015514
fix typo 2018-11-08 16:28:13 +00:00
Richard van der Hoff f9cf99f1fd
typo 2018-11-08 15:31:58 +00:00
Richard van der Hoff efc8056fb6 fix a couple of broken links 2018-11-07 13:48:27 +00:00
Richard van der Hoff f30e685112 proposal for requiring signed certs for federation 2018-11-07 13:41:53 +00:00
Richard van der Hoff 09d41464e7 Add problems section 
xs
 2018-11-06 11:39:08 +00:00
Richard van der Hoff c4e1949cf8 Clarifications about what server means 2018-11-06 11:39:08 +00:00
Richard van der Hoff e3f10a4fd2
Update 1708-well-known-for-federation.md 
fix title
 2018-11-05 18:37:25 +00:00
Richard van der Hoff 87330b9b9b Proposal for .well-known for server discovery 2018-11-05 18:23:23 +00: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
Erik Johnston 25fb09b991 Fix up formatting 2018-10-30 13:42:18 +00:00