Commit graph

3426 commits

Author SHA1 Message Date
Matthew Hodgson
d377bedd76 fix path 2018-09-01 01:54:13 +01:00
Matthew Hodgson
30d56691b1 document device list synchronisation over federation.
untested
closes MSC1212
2018-09-01 01:48:02 +01:00
Matthew Hodgson
d789564db7 only apply list CSS overrides to section classes 2018-09-01 01:12:55 +01:00
Travis Ralston
bd78445756 Merge branch 'travis/general/changelogs' into m-master 2018-08-31 17:40:41 -06:00
Travis Ralston
735de03e07 Add r0 version links
These were missed in the release process.
2018-08-31 17:40:32 -06:00
Travis Ralston
3ba64f95e6
Merge pull request #1647 from matrix-org/client_server/release-r0.4.0
r0.4.0 release of the Client-Server specification
2018-08-31 17:07:38 -06:00
Travis Ralston
485928486a Client-server r0.4.0 changelog 2018-08-31 16:45:41 -06:00
Travis Ralston
17a6a4c2ee Merge branch 'travis/c2s/fix-changelog' into client_server/release-r0.4.0 2018-08-31 16:45:09 -06:00
Travis Ralston
bb2835651f
Merge pull request #1637 from turt2live/travis/c2s/clarify-errors
List known client-server error codes; Clarify priority of error codes vs http status code
2018-08-31 16:42:43 -06:00
Travis Ralston
51883562b9
Merge pull request #1645 from matrix-org/identity_service/release-r0.1.0
Identity Service r0.1.0 release
2018-08-31 16:41:00 -06:00
Travis Ralston
680ab5e194 Misc formatting things
Consistency, make the renderer happy
2018-08-31 16:36:51 -06:00
Travis Ralston
247ae26ec4 Consistency 2018-08-31 16:33:17 -06:00
Travis Ralston
d5af3bae43 This isn't a new endpoint 2018-08-31 16:33:09 -06:00
Travis Ralston
10fa5a3a01 Changelog for r0.1.0 IS spec 2018-08-31 16:21:51 -06:00
Travis Ralston
00578547c0
Merge pull request #1644 from matrix-org/rav/is_token_grammar
Spec grammars for IS things
2018-08-31 16:05:23 -06:00
Travis Ralston
30737cce96
Merge pull request #1643 from turt2live/travis/sanity/fix-naming
Fix all naming of "homeserver" and "identity server"
2018-08-31 15:56:17 -06:00
Travis Ralston
f3825c5827 A couple more stragglers 2018-08-31 15:55:07 -06:00
Travis Ralston
218b86d6e8 Hopefully the last one 2018-08-31 15:48:41 -06:00
Richard van der Hoff
79974b152c s/identity service/identity server 2018-08-31 22:44:36 +01:00
Travis Ralston
2af09655ce Fix the stragglers 2018-08-31 15:44:23 -06:00
Richard van der Hoff
21f8898cd8 Merge remote-tracking branch 'origin/master' into rav/is_token_grammar 2018-08-31 22:38:04 +01:00
Richard van der Hoff
a544b68298 Merge branch 'master' into rav/is_token_grammar 2018-08-31 22:37:04 +01:00
Travis Ralston
7d34995ece It's actually an "identity server implementing the Identity Service API"
Also add a note about appservices being special.
2018-08-31 15:35:32 -06:00
Travis Ralston
c94f3619b7 Missed a rogue case of identity server 2018-08-31 15:09:18 -06:00
Travis Ralston
7ac76fa27c Actually we're going with "identity server" afterall 2018-08-31 15:04:00 -06:00
Travis Ralston
ec248b436f Identity Service is lowercase 2018-08-31 15:04:00 -06:00
Travis Ralston
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.
2018-08-31 15:04:00 -06:00
Travis Ralston
683072e624
Merge pull request #1636 from turt2live/travis/c2s/id-server
Clean up and flesh out all three editions of the /requestToken API
2018-08-31 14:57:17 -06:00
Travis Ralston
a1f655e5be Fix more error wording 2018-08-31 14:53:59 -06:00
Travis Ralston
108c623557
Merge pull request #1635 from turt2live/travis/c2s/read-markers
Add read markers
2018-08-31 14:47:39 -06:00
Richard van der Hoff
8773b9319b
Merge pull request #1599 from matrix-org/benpa/spec-tables-prettier
Benpa/spec tables prettier
2018-08-31 21:40:55 +01:00
Travis Ralston
84a2b7f3c0
Merge pull request #1632 from uhoreg/fix_room_member_state_key
fix handling of multi-line state key descriptions
2018-08-31 14:38:58 -06:00
Travis Ralston
1261da209d Fix wording for the homeserver not allowing a particular 3pid 2018-08-31 14:38:22 -06:00
Travis Ralston
dfe6d0d3b8
Merge pull request #1642 from turt2live/travis/c2s/pagination
Generalize language for pagination
2018-08-31 14:23:31 -06:00
Travis Ralston
835f5de387 Generalize the token name even more 2018-08-31 14:22:07 -06:00
Richard van der Hoff
cb1e687196 spec the format of an IS invite token 2018-08-31 21:16:32 +01:00
Richard van der Hoff
69c30ef156 spec the format of a client_secret 2018-08-31 21:11:11 +01:00
Richard van der Hoff
dced3d5707 Notes on the format of IS session IDs and tokens 2018-08-31 21:06:51 +01:00
Travis Ralston
f299fe023a English 2018-08-31 12:51:31 -06:00
Travis Ralston
e49ed5d1ec Changelog 2018-08-31 12:37:24 -06:00
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
2018-08-31 12:36:08 -06:00
Travis Ralston
824ce22caa Add additional clarity to the requestToken errors 2018-08-31 11:41:46 -06:00
Travis Ralston
5bb7eca8e8 English 2018-08-31 11:37:37 -06:00
Hubert Chathi
c0dd7e0025
Merge pull request #1420 from Zil0/encrypted_attach
Document encrypted attachments
2018-08-31 13:33:05 -04:00
Travis Ralston
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.
2018-08-31 11:26:28 -06:00
Travis Ralston
63fdd72f73 Fix error description on /account/3pid/email/requestToken 2018-08-31 11:24:35 -06:00
Travis Ralston
25a461b86e
Merge pull request #1617 from turt2live/travis/c2s/rich-replies
Add rich replies
2018-08-31 11:21:34 -06:00
Travis Ralston
4b9fb99644 Take out unhelpful example 2018-08-31 11:18:54 -06:00
Travis Ralston
3146fc339a Merge remote-tracking branch 'matrix-org/master' into travis/c2s/clarify-errors 2018-08-31 11:15:03 -06:00
Travis Ralston
f6d9e53f5c Clarify that homeserver must reject clients from setting m.fully_read 2018-08-31 11:13:32 -06:00