2af09655ce
Fix the stragglers
6 years ago
21f8898cd8
Merge remote-tracking branch 'origin/master' into rav/is_token_grammar
6 years ago
a544b68298
Merge branch 'master' into rav/is_token_grammar
6 years ago
7d34995ece
It's actually an "identity server implementing the Identity Service API"
...
Also add a note about appservices being special.
6 years ago
c94f3619b7
Missed a rogue case of identity server
6 years ago
7ac76fa27c
Actually we're going with "identity server" afterall
6 years ago
ec248b436f
Identity Service is lowercase
6 years ago
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.
6 years ago
683072e624
Merge pull request #1636 from turt2live/travis/c2s/id-server
...
Clean up and flesh out all three editions of the /requestToken API
6 years ago
a1f655e5be
Fix more error wording
6 years ago
108c623557
Merge pull request #1635 from turt2live/travis/c2s/read-markers
...
Add read markers
6 years ago
8773b9319b
Merge pull request #1599 from matrix-org/benpa/spec-tables-prettier
...
Benpa/spec tables prettier
6 years ago
84a2b7f3c0
Merge pull request #1632 from uhoreg/fix_room_member_state_key
...
fix handling of multi-line state key descriptions
6 years ago
1261da209d
Fix wording for the homeserver not allowing a particular 3pid
6 years ago
dfe6d0d3b8
Merge pull request #1642 from turt2live/travis/c2s/pagination
...
Generalize language for pagination
6 years ago
835f5de387
Generalize the token name even more
6 years ago
cb1e687196
spec the format of an IS invite token
6 years ago
69c30ef156
spec the format of a client_secret
6 years ago
dced3d5707
Notes on the format of IS session IDs and tokens
6 years ago
f299fe023a
English
6 years ago
e49ed5d1ec
Changelog
6 years ago
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
824ce22caa
Add additional clarity to the requestToken errors
6 years ago
5bb7eca8e8
English
6 years ago
c0dd7e0025
Merge pull request #1420 from Zil0/encrypted_attach
...
Document encrypted attachments
6 years ago
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
25a461b86e
Merge pull request #1617 from turt2live/travis/c2s/rich-replies
...
Add rich replies
6 years ago
4b9fb99644
Take out unhelpful example
6 years ago
3146fc339a
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/clarify-errors
6 years ago
f6d9e53f5c
Clarify that homeserver must reject clients from setting m.fully_read
6 years ago
2e8151999e
Clarify that read markers are fully read markers
6 years ago
f1f32d3a15
add more clarifications
6 years ago
679ddabb53
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/read-markers
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
567843e043
Add additional clarity to how rich replies are structured and used
6 years ago
e3daf10bb9
refactor encrypted file schema as "Extension to m.message"
6 years ago
9004be7bda
Merge remote matrix-org/master
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
Travis Ralston