Commit graph

179 commits

Author SHA1 Message Date
Travis Ralston
ec248b436f Identity Service is lowercase 2018-08-31 15:04:00 -06:00
Travis Ralston
cc0badaaa1 Fix all naming cases of "identity service"
Fixes https://github.com/matrix-org/matrix-doc/issues/1396

Includes some "homeserver" fixes too. This commit does not include historical documentation or notes.
2018-08-31 15:04:00 -06:00
Travis Ralston
38ae166e9d
Merge pull request #1505 from turt2live/travis/general/3pid_invite
Clarify how third party invites work
2018-08-31 08:38:40 -06:00
Erik Johnston
080845ac1c Add link to previous section 2018-08-31 12:00:38 +01:00
Erik Johnston
bbca5ce43a Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/limit_auth_events 2018-08-31 11:52:36 +01:00
Erik Johnston
b6ed25e4b4 Fix incorrect indent 2018-08-31 11:32:29 +01:00
Erik Johnston
f3a13eed76
Merge pull request #1593 from matrix-org/erikj/auth_events
Update rules on which events to add to `auth_events`
2018-08-31 11:27:03 +01:00
Erik Johnston
86891ca7e4
Merge pull request #1625 from matrix-org/erikj/auth_rejections
Explain how to handle rejected events
2018-08-31 11:26:57 +01:00
Erik Johnston
d91dc6fbf6 Fixup 2018-08-31 11:20:26 +01:00
Erik Johnston
4d653748d6 Add note back in 2018-08-31 11:17:58 +01:00
Erik Johnston
8e6c8ba59e Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/spec_3pid_ruls 2018-08-31 11:13:13 +01:00
Erik Johnston
a1aedb386a Actually use proper sentences like a proper adult 2018-08-31 11:04:49 +01:00
Erik Johnston
0adfd1ebb0
Merge pull request #1591 from matrix-org/erikj/fixup_auth_rules
Fix up auth rules
2018-08-31 11:01:12 +01:00
Erik Johnston
d63184ebac Fixup 2018-08-31 10:59:42 +01:00
Erik Johnston
3c53e1910d Fixup 2018-08-31 10:51:59 +01:00
Erik Johnston
1a45bc4a85 Reword 2018-08-31 10:24:51 +01:00
Erik Johnston
59f86ec8f2 Reindent as RST requires sublists to be three spaces 2018-08-31 10:07:59 +01:00
Erik Johnston
f4706c8889 Require creator field 2018-08-31 10:06:26 +01:00
Erik Johnston
f3aea32a24 Be consistent with 'If..., reject' 2018-08-31 09:59:45 +01:00
Erik Johnston
6c8a45c165 Full stops 2018-08-31 09:57:00 +01:00
Erik Johnston
ebb044674f Remove duplicated explanation about event rejection 2018-08-31 09:51:17 +01:00
Travis Ralston
caaa688e37 Fix links to client-server spec 2018-08-30 16:28:26 -06:00
Travis Ralston
219b27b182 Merge remote matrix-org/master 2018-08-30 16:27:20 -06:00
Richard van der Hoff
0f84c69805
Merge branch 'master' into rav/clarify_event_signing 2018-08-30 22:48:56 +01:00
Travis Ralston
d57b977a55 Merge branch 'm-master' into travis/general/3pid_invite 2018-08-30 15:01:31 -06:00
Travis Ralston
f09db16027 Merge remote-tracking branch 'matrix-org/master' into travis/s2s/key-mgmt 2018-08-30 12:19:59 -06:00
Travis Ralston
2753d24302 Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep 2018-08-30 12:17:09 -06:00
Travis Ralston
ab14f33060 Add link to the client-server ACLs module 2018-08-30 10:11:37 -06:00
Erik Johnston
5c2b8e3569 Explain how to handle rejeceted events 2018-08-30 17:03:16 +01:00
Richard van der Hoff
55c4307f12 Rewrite the section on signing events
... for clarity and de-duplication. And to say a bit about validating the
signatures.
2018-08-30 14:37:24 +01:00
Richard van der Hoff
6ba50fe2f6
Merge pull request #1588 from matrix-org/rav/fix_server_name
Specify that server names cannot be %-encoded
2018-08-30 10:48:06 +01:00
Travis Ralston
c7a228bf7b Don't make the major version a variable
We are likely to want to maintain v1 when we release a v2, so we'll avoid a variable for now.
2018-08-29 19:32:52 -06:00
Travis Ralston
e7a69a6a6d Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep 2018-08-29 19:29:42 -06:00
Richard van der Hoff
196159be91 We should include the Host header if the port was explicit. 2018-08-29 22:18:14 +01:00
Travis Ralston
f2d02c9559 Take out device management section for now
This will be handled by the implementation of https://github.com/matrix-org/matrix-doc/issues/1212
2018-08-29 14:37:30 -06:00
Travis Ralston
8950f0b2cc Spelling 2018-08-29 14:36:43 -06:00
Erik Johnston
d921b81c70 Reject events with superfluous auth_events entries 2018-08-29 14:17:52 +01:00
Erik Johnston
073ebb051b Spec third party invites in auth rules 2018-08-29 14:01:07 +01:00
Erik Johnston
5d40af7ecf Update rules on which events to add to auth_events 2018-08-29 13:24:02 +01:00
Erik Johnston
86b5486445 Add missing clauses to and fix authorization rules
They are still missing third party invites.
2018-08-29 11:32:14 +01:00
Erik Johnston
0b7b3bfcb0 Reindent auth rules section
RST expects sub lists to be indented by three or more spaces. By doing
so we can then rely on `#.` for automatic numbering.
2018-08-29 11:20:33 +01:00
Richard van der Hoff
d493c82e82 even more clarification 2018-08-29 10:04:02 +01:00
Erik Johnston
7327656965
Merge pull request #1581 from matrix-org/erikj/limit_txn_size
Specify a limit on the number of EDUs and PDUs a transaction can contain
2018-08-29 09:48:57 +01:00
Richard van der Hoff
78d8118846 Further server_name clarification 2018-08-29 09:36:50 +01:00
Richard van der Hoff
f15eafae7f Remove trailing spaces 2018-08-29 09:26:31 +01:00
Richard van der Hoff
08fba5de51 Link to grammar rather than duplicating. 2018-08-29 09:25:38 +01:00
Erik Johnston
fc1fdc95af Specify a limit on the number of EDUs and PDUs a transaction can contain 2018-08-28 17:29:58 +01:00
Travis Ralston
cff5b8b205 More versioned links 2018-08-27 19:30:46 -06:00
Travis Ralston
be97e95dc1 Promote device management to be a dedicated section 2018-08-27 14:49:38 -06:00
Travis Ralston
8069981252 Add federation /user/* endpoints
Fixes https://github.com/matrix-org/matrix-doc/issues/1438
2018-08-27 14:19:10 -06:00