Commit graph

118 commits

Author SHA1 Message Date
Erik Johnston
1c0742ed6a
MSC 1659 Proposal: Change Event IDs to Hashes (#1659) 2019-01-30 17:08:21 +00:00
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
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
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
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
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