Travis Ralston
f013b7ef03
Merge pull request #1631 from turt2live/travis/general/unstable-warning
...
Render a warning if the spec is unstable
7 years ago
Travis Ralston
ab00630ebc
Don't include a second unstable warning in the s2s spec for now
7 years ago
Travis Ralston
f72c821be4
Merge pull request #1619 from turt2live/travis/c2s/local-echo
...
Reference that transaction IDs may be used to echo
7 years ago
Travis Ralston
2e316ea80b
Merge pull request #1630 from matrix-org/application_service/release-r0.1.0
...
r0.1.0 for the Application Service specification
7 years ago
Travis Ralston
136ba15eb2
Merge pull request #1605 from turt2live/travis/c2s/clarify-html-again
...
Mention that clients should not be producing invalid HTML
7 years ago
Travis Ralston
38ae166e9d
Merge pull request #1505 from turt2live/travis/general/3pid_invite
...
Clarify how third party invites work
7 years ago
Travis Ralston
afa16f1e4e
Merge pull request #1606 from turt2live/travis/c2s/room-tags
...
Update the room tagging documentation
7 years ago
Travis Ralston
c127eed7e7
Merge pull request #1600 from turt2live/travis/c2s/media-csp
...
Specify the minimum CSP for media
7 years ago
Travis Ralston
73736d41db
Merge pull request #1569 from turt2live/travis/c2s/user-directory
...
Clarify the homeserver's behaviour for user searching
7 years ago
Travis Ralston
9646d99c9e
Merge pull request #1602 from turt2live/travis/general/redactions
...
Add the other fields the server is expected to keep on events
7 years ago
Erik Johnston
6235c2e720
Merge pull request #1594 from matrix-org/erikj/limit_auth_events
...
Reject events with superfluous auth_events entries
7 years ago
Erik Johnston
080845ac1c
Add link to previous section
7 years ago
Erik Johnston
bbca5ce43a
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/limit_auth_events
7 years ago
Erik Johnston
b6ed25e4b4
Fix incorrect indent
7 years ago
Erik Johnston
f3a13eed76
Merge pull request #1593 from matrix-org/erikj/auth_events
...
Update rules on which events to add to `auth_events`
7 years ago
Erik Johnston
86891ca7e4
Merge pull request #1625 from matrix-org/erikj/auth_rejections
...
Explain how to handle rejected events
7 years ago
Erik Johnston
da3dd40e06
Merge pull request #1592 from matrix-org/erikj/spec_3pid_ruls
...
Spec third party invites in auth rules
7 years ago
Erik Johnston
d91dc6fbf6
Fixup
7 years ago
Erik Johnston
4d653748d6
Add note back in
7 years ago
Erik Johnston
8e6c8ba59e
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/spec_3pid_ruls
7 years ago
Erik Johnston
a1aedb386a
Actually use proper sentences like a proper adult
7 years ago
Erik Johnston
0adfd1ebb0
Merge pull request #1591 from matrix-org/erikj/fixup_auth_rules
...
Fix up auth rules
7 years ago
Erik Johnston
d63184ebac
Fixup
7 years ago
Erik Johnston
3c53e1910d
Fixup
7 years ago
Erik Johnston
1a45bc4a85
Reword
7 years ago
Erik Johnston
59f86ec8f2
Reindent as RST requires sublists to be three spaces
7 years ago
Erik Johnston
f4706c8889
Require creator field
7 years ago
Erik Johnston
f3aea32a24
Be consistent with 'If..., reject'
7 years ago
Erik Johnston
6c8a45c165
Full stops
7 years ago
Erik Johnston
ebb044674f
Remove duplicated explanation about event rejection
7 years ago
Travis Ralston
7f719b23e7
Merge pull request #1589 from turt2live/travis/c2s/inhibit-login
...
Document the inhibit_login registration option
7 years ago
Travis Ralston
2f55dd66da
Merge pull request #1441 from matrix-org/erikj/state_res_msc
...
State Resolution: Reloaded MSC
7 years ago
Travis Ralston
ce14779af1
Merge pull request #1567 from turt2live/travis/c2s/3pid-binding
...
Document `validated_at`, `added_at`, and POST /3pid/delete
7 years ago
Travis Ralston
5da3072eef
Wording change ('may not' has a special meaning)
7 years ago
Travis Ralston
4b7f308fc4
Merge pull request #1576 from turt2live/travis/s2s/key-mgmt
...
Add federation /user/keys/* endpoints
7 years ago
Travis Ralston
2a08a308f3
device_keys are required
7 years ago
Travis Ralston
caaa688e37
Fix links to client-server spec
7 years ago
Travis Ralston
219b27b182
Merge remote matrix-org/master
7 years ago
Richard van der Hoff
492df88024
Merge pull request #1622 from matrix-org/rav/clarify_event_signing
...
Rewrite the section on signing events
7 years ago
Richard van der Hoff
0f84c69805
Merge branch 'master' into rav/clarify_event_signing
7 years ago
Travis Ralston
8bcd7d26e3
/3pid/delete returns an empty object
7 years ago
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.
7 years ago
Travis Ralston
86c85aea71
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/3pid-binding
7 years ago
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.
7 years ago
Travis Ralston
d57b977a55
Merge branch 'm-master' into travis/general/3pid_invite
7 years ago
Travis Ralston
1f6499d563
Fix typo
7 years ago
Travis Ralston
356626845c
Remove unhelpful arrow from the 3rd party invite sequence dance
...
This doesn't add anything in terms of clarity.
7 years ago
Travis Ralston
5e6a2c30a2
Comment out the part where identity services can revoke their keys
...
They can't because otherwise 3rd party invites can be rejected by homeservers, as per https://github.com/matrix-org/matrix-doc/issues/1633
7 years ago
Travis Ralston
cee0a5ac7b
Merge pull request #1557 from turt2live/travis/general/r0-prep
...
Prepare the identity service and server-server APIs for r0
7 years ago
Travis Ralston
4630c06721
Appservice r0.1.0 changelog
7 years ago