wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3349 commits 4 branches 0 tags 17 MiB
Commit graph

3349 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
9004be7bda Merge remote matrix-org/master 2018-08-31 10:08:05 -06:00
Travis Ralston
25778989a1
Merge pull request #1573 from turt2live/travis/c2s/sync-event-fields 
Fix event schemas for /sync
 2018-08-31 10:00:17 -06:00
Travis Ralston
f013b7ef03
Merge pull request #1631 from turt2live/travis/general/unstable-warning 
Render a warning if the spec is unstable
 2018-08-31 09:50:37 -06:00
Travis Ralston
ab00630ebc Don't include a second unstable warning in the s2s spec for now 2018-08-31 09:49:24 -06:00
Travis Ralston
f72c821be4
Merge pull request #1619 from turt2live/travis/c2s/local-echo 
Reference that transaction IDs may be used to echo
 2018-08-31 09:48:02 -06:00
Travis Ralston
e3ad253dca A sender is also required for the invite_state 2018-08-31 09:44:29 -06:00
Travis Ralston
2f824df8dd Define the real event types on the invite_state 2018-08-31 09:43:29 -06:00
Travis Ralston
fc037b3a72 Fix merge 2018-08-31 09:33:30 -06:00
Travis Ralston
2e3e189ea2 Merge remote matrix-org/master 2018-08-31 09:31:39 -06:00
Travis Ralston
2e316ea80b
Merge pull request #1630 from matrix-org/application_service/release-r0.1.0 
r0.1.0 for the Application Service specification
 2018-08-31 09:12:47 -06:00
Travis Ralston
136ba15eb2
Merge pull request #1605 from turt2live/travis/c2s/clarify-html-again 
Mention that clients should not be producing invalid HTML
 2018-08-31 08:41:29 -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
Travis Ralston
afa16f1e4e
Merge pull request #1606 from turt2live/travis/c2s/room-tags 
Update the room tagging documentation
 2018-08-31 08:36:40 -06:00
Travis Ralston
c127eed7e7
Merge pull request #1600 from turt2live/travis/c2s/media-csp 
Specify the minimum CSP for media
 2018-08-31 08:32:33 -06:00
Travis Ralston
73736d41db
Merge pull request #1569 from turt2live/travis/c2s/user-directory 
Clarify the homeserver's behaviour for user searching
 2018-08-31 08:32:02 -06:00
Travis Ralston
9646d99c9e
Merge pull request #1602 from turt2live/travis/general/redactions 
Add the other fields the server is expected to keep on events
 2018-08-31 08:31:50 -06:00
Erik Johnston
6235c2e720
Merge pull request #1594 from matrix-org/erikj/limit_auth_events 
Reject events with superfluous auth_events entries
 2018-08-31 13:05:04 +01: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
da3dd40e06
Merge pull request #1592 from matrix-org/erikj/spec_3pid_ruls 
Spec third party invites in auth rules
 2018-08-31 11:26:45 +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
7f719b23e7
Merge pull request #1589 from turt2live/travis/c2s/inhibit-login 
Document the inhibit_login registration option
 2018-08-30 18:21:39 -06:00
Travis Ralston
2f55dd66da
Merge pull request #1441 from matrix-org/erikj/state_res_msc 
State Resolution: Reloaded MSC
 2018-08-30 16:56:17 -06:00
Travis Ralston
ce14779af1
Merge pull request #1567 from turt2live/travis/c2s/3pid-binding 
Document `validated_at`, `added_at`, and POST /3pid/delete
 2018-08-30 16:33:24 -06:00
Travis Ralston
5da3072eef Wording change ('may not' has a special meaning) 2018-08-30 16:32:14 -06:00
Travis Ralston
4b7f308fc4
Merge pull request #1576 from turt2live/travis/s2s/key-mgmt 
Add federation /user/keys/* endpoints
 2018-08-30 16:30:57 -06:00
Travis Ralston
2a08a308f3 device_keys are required 2018-08-30 16:29:24 -06: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
492df88024
Merge pull request #1622 from matrix-org/rav/clarify_event_signing 
Rewrite the section on signing events
 2018-08-30 23:06:13 +01:00
Richard van der Hoff
0f84c69805
Merge branch 'master' into rav/clarify_event_signing 2018-08-30 22:48:56 +01:00
Travis Ralston
8bcd7d26e3 /3pid/delete returns an empty object 2018-08-30 15:28:43 -06:00
Travis Ralston
390f1c16f7 Remove mentions of identity services from /3pid/delete 
This will be covered by https://github.com/matrix-org/matrix-doc/issues/1194

For now, we can accept that homeservers may try to unbind, however clients should not rely on it.
 2018-08-30 15:27:36 -06:00
Travis Ralston
86c85aea71 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/3pid-binding 2018-08-30 15:23:50 -06:00
Travis Ralston
98a445890c Render a warning if the spec is unstable 
Fixes https://github.com/matrix-org/matrix-doc/issues/1499

This is done by using magic variables in the RST. The magic variables are generated based on the substitutions available, making them available for use at build-time. 

Magic variables were chosen because it allows people to continue working on the spec and release process without having to worry about removing a chunk of text from the top of the file. Originally, this was attempted by using jinja2 if-statements, however the substitutions are replaced *after* the template is executed, so the condition would never match. 

The format of the variable is to make the templating happy. Using colons or percent signs results in the templator thinking something else is going on, and then complaining about format.
 2018-08-30 15:05:50 -06:00