60dd9231e0
Don't explain how the IS might accept a 3pid
...
The IS is bound to it's own set of specifications, and if the client chose this API then they should be aware of the risks but not necessarily arbitrary alternatives.
6 years ago
63fdd72f73
Fix error description on /account/3pid/email/requestToken
6 years ago
a4c2b2b905
General clarity and spelling for the requestToken APIs
6 years ago
7f1b94c211
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/id-server
6 years ago
25778989a1
Merge pull request #1573 from turt2live/travis/c2s/sync-event-fields
...
Fix event schemas for /sync
6 years ago
f013b7ef03
Merge pull request #1631 from turt2live/travis/general/unstable-warning
...
Render a warning if the spec is unstable
6 years ago
ab00630ebc
Don't include a second unstable warning in the s2s spec for now
6 years ago
f72c821be4
Merge pull request #1619 from turt2live/travis/c2s/local-echo
...
Reference that transaction IDs may be used to echo
6 years ago
e3ad253dca
A sender is also required for the invite_state
6 years ago
2f824df8dd
Define the real event types on the invite_state
6 years ago
fc037b3a72
Fix merge
6 years ago
2e3e189ea2
Merge remote matrix-org/master
6 years ago
2e316ea80b
Merge pull request #1630 from matrix-org/application_service/release-r0.1.0
...
r0.1.0 for the Application Service specification
6 years ago
136ba15eb2
Merge pull request #1605 from turt2live/travis/c2s/clarify-html-again
...
Mention that clients should not be producing invalid HTML
6 years ago
38ae166e9d
Merge pull request #1505 from turt2live/travis/general/3pid_invite
...
Clarify how third party invites work
6 years ago
afa16f1e4e
Merge pull request #1606 from turt2live/travis/c2s/room-tags
...
Update the room tagging documentation
6 years ago
c127eed7e7
Merge pull request #1600 from turt2live/travis/c2s/media-csp
...
Specify the minimum CSP for media
6 years ago
73736d41db
Merge pull request #1569 from turt2live/travis/c2s/user-directory
...
Clarify the homeserver's behaviour for user searching
6 years ago
9646d99c9e
Merge pull request #1602 from turt2live/travis/general/redactions
...
Add the other fields the server is expected to keep on events
6 years ago
6235c2e720
Merge pull request #1594 from matrix-org/erikj/limit_auth_events
...
Reject events with superfluous auth_events entries
6 years ago
080845ac1c
Add link to previous section
6 years ago
bbca5ce43a
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/limit_auth_events
6 years ago
b6ed25e4b4
Fix incorrect indent
6 years ago
f3a13eed76
Merge pull request #1593 from matrix-org/erikj/auth_events
...
Update rules on which events to add to `auth_events`
6 years ago
86891ca7e4
Merge pull request #1625 from matrix-org/erikj/auth_rejections
...
Explain how to handle rejected events
6 years ago
da3dd40e06
Merge pull request #1592 from matrix-org/erikj/spec_3pid_ruls
...
Spec third party invites in auth rules
6 years ago
d91dc6fbf6
Fixup
6 years ago
4d653748d6
Add note back in
6 years ago
8e6c8ba59e
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/spec_3pid_ruls
6 years ago
a1aedb386a
Actually use proper sentences like a proper adult
6 years ago
0adfd1ebb0
Merge pull request #1591 from matrix-org/erikj/fixup_auth_rules
...
Fix up auth rules
6 years ago
d63184ebac
Fixup
6 years ago
3c53e1910d
Fixup
6 years ago
1a45bc4a85
Reword
6 years ago
59f86ec8f2
Reindent as RST requires sublists to be three spaces
6 years ago
f4706c8889
Require creator field
6 years ago
f3aea32a24
Be consistent with 'If..., reject'
6 years ago
6c8a45c165
Full stops
6 years ago
ebb044674f
Remove duplicated explanation about event rejection
6 years ago
4bd23a9086
send_attempt is no longer optional
6 years ago
7f719b23e7
Merge pull request #1589 from turt2live/travis/c2s/inhibit-login
...
Document the inhibit_login registration option
6 years ago
f3181bbedd
Changelog
6 years ago
dfaed5b525
Clean up and flesh out all three editions of the /requestToken API
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1634
Addresses some of https://github.com/matrix-org/matrix-doc/issues/1396
6 years ago
2f55dd66da
Merge pull request #1441 from matrix-org/erikj/state_res_msc
...
State Resolution: Reloaded MSC
6 years ago
ce14779af1
Merge pull request #1567 from turt2live/travis/c2s/3pid-binding
...
Document `validated_at`, `added_at`, and POST /3pid/delete
6 years ago
5da3072eef
Wording change ('may not' has a special meaning)
6 years ago
4b7f308fc4
Merge pull request #1576 from turt2live/travis/s2s/key-mgmt
...
Add federation /user/keys/* endpoints
6 years ago
2a08a308f3
device_keys are required
6 years ago
caaa688e37
Fix links to client-server spec
6 years ago
219b27b182
Merge remote matrix-org/master
6 years ago
Travis Ralston