Richard van der Hoff
a544b68298
Merge branch 'master' into rav/is_token_grammar
6 years ago
Travis Ralston
108c623557
Merge pull request #1635 from turt2live/travis/c2s/read-markers
...
Add read markers
6 years ago
Richard van der Hoff
8773b9319b
Merge pull request #1599 from matrix-org/benpa/spec-tables-prettier
...
Benpa/spec tables prettier
6 years ago
Travis Ralston
84a2b7f3c0
Merge pull request #1632 from uhoreg/fix_room_member_state_key
...
fix handling of multi-line state key descriptions
6 years ago
Travis Ralston
dfe6d0d3b8
Merge pull request #1642 from turt2live/travis/c2s/pagination
...
Generalize language for pagination
6 years ago
Travis Ralston
835f5de387
Generalize the token name even more
6 years ago
Richard van der Hoff
cb1e687196
spec the format of an IS invite token
6 years ago
Richard van der Hoff
69c30ef156
spec the format of a client_secret
6 years ago
Richard van der Hoff
dced3d5707
Notes on the format of IS session IDs and tokens
6 years ago
Travis Ralston
f299fe023a
English
6 years ago
Travis Ralston
e49ed5d1ec
Changelog
6 years ago
Travis Ralston
f4c5c209f3
Generalize language for pagination
...
Previously the section was very strict in what pagination was, however this isn't the reality for the matrix specification. Several endpoints have their own pagination naming conventions and do not follow those mandated by this section.
This commit generalizes the language to cover those endpoints while also describing how pagination works. In particular, it describes the rough API shape to expect and how to deal with the responses.
This commit also removes the `M_BAD_PAGINATION` error as it is not used in the real world. Homeservers are instead encouraged to use the standard `M_INVALID_PARAM` or similar error code.
Fixes https://github.com/matrix-org/matrix-doc/issues/610
Fixes https://github.com/matrix-org/matrix-doc/issues/1523
6 years ago
Hubert Chathi
c0dd7e0025
Merge pull request #1420 from Zil0/encrypted_attach
...
Document encrypted attachments
6 years ago
Travis Ralston
25a461b86e
Merge pull request #1617 from turt2live/travis/c2s/rich-replies
...
Add rich replies
6 years ago
Travis Ralston
4b9fb99644
Take out unhelpful example
6 years ago
Travis Ralston
f6d9e53f5c
Clarify that homeserver must reject clients from setting m.fully_read
6 years ago
Travis Ralston
2e8151999e
Clarify that read markers are fully read markers
6 years ago
Hubert Chathi
f1f32d3a15
add more clarifications
6 years ago
Travis Ralston
679ddabb53
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/read-markers
6 years ago
Travis Ralston
a4c2b2b905
General clarity and spelling for the requestToken APIs
6 years ago
Travis Ralston
7f1b94c211
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/id-server
6 years ago
Travis Ralston
567843e043
Add additional clarity to how rich replies are structured and used
6 years ago
Hubert Chathi
e3daf10bb9
refactor encrypted file schema as "Extension to m.message"
6 years ago
Travis Ralston
9004be7bda
Merge remote matrix-org/master
6 years ago
Travis Ralston
25778989a1
Merge pull request #1573 from turt2live/travis/c2s/sync-event-fields
...
Fix event schemas for /sync
6 years ago
Travis Ralston
f013b7ef03
Merge pull request #1631 from turt2live/travis/general/unstable-warning
...
Render a warning if the spec is unstable
6 years ago
Travis Ralston
ab00630ebc
Don't include a second unstable warning in the s2s spec for now
6 years ago
Travis Ralston
f72c821be4
Merge pull request #1619 from turt2live/travis/c2s/local-echo
...
Reference that transaction IDs may be used to echo
6 years ago
Travis Ralston
e3ad253dca
A sender is also required for the invite_state
6 years ago
Travis Ralston
2f824df8dd
Define the real event types on the invite_state
6 years ago
Travis Ralston
fc037b3a72
Fix merge
6 years ago
Travis Ralston
2e3e189ea2
Merge remote matrix-org/master
6 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
6 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
6 years ago
Travis Ralston
38ae166e9d
Merge pull request #1505 from turt2live/travis/general/3pid_invite
...
Clarify how third party invites work
6 years ago
Travis Ralston
afa16f1e4e
Merge pull request #1606 from turt2live/travis/c2s/room-tags
...
Update the room tagging documentation
6 years ago
Travis Ralston
c127eed7e7
Merge pull request #1600 from turt2live/travis/c2s/media-csp
...
Specify the minimum CSP for media
6 years ago
Travis Ralston
73736d41db
Merge pull request #1569 from turt2live/travis/c2s/user-directory
...
Clarify the homeserver's behaviour for user searching
6 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
6 years ago
Ben Parsons
c77b505441
capitali[zs]e path parameters
6 years ago
Ben Parsons
778fe2a47a
css caption size tweak
6 years ago
Ben Parsons
e8afab1fe5
many visual improvements
6 years ago
Erik Johnston
6235c2e720
Merge pull request #1594 from matrix-org/erikj/limit_auth_events
...
Reject events with superfluous auth_events entries
6 years ago
Erik Johnston
080845ac1c
Add link to previous section
6 years ago
Erik Johnston
bbca5ce43a
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/limit_auth_events
6 years ago
Erik Johnston
b6ed25e4b4
Fix incorrect indent
6 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`
6 years ago
Erik Johnston
86891ca7e4
Merge pull request #1625 from matrix-org/erikj/auth_rejections
...
Explain how to handle rejected events
6 years ago
Erik Johnston
da3dd40e06
Merge pull request #1592 from matrix-org/erikj/spec_3pid_ruls
...
Spec third party invites in auth rules
6 years ago
Erik Johnston
d91dc6fbf6
Fixup
6 years ago