Richard van der Hoff
818b48cbbb
make_leave returns an event
field too
2018-10-03 14:41:40 +01:00
Richard van der Hoff
e17dd12007
make_join returns its event under an event
key
2018-10-03 14:34:47 +01:00
Matthew Hodgson
6dab4b28f8
Merge pull request #1648 from matrix-org/matthew/device_list_update
...
document device list synchronisation over federation.
2018-09-03 16:54:36 +01:00
Konstantinos Sideris
192a6c2ab9
Use example.org on examples instead of domain.com which is a real domain
...
Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com>
2018-09-02 17:58:21 +03:00
Matthew Hodgson
ee5e519885
device list is 2 words
2018-09-02 13:05:15 +01:00
Matthew Hodgson
928fc5cbe5
incorporate review
2018-09-01 03:08:53 +01:00
Matthew Hodgson
43f2819702
switch to travis' example
2018-09-01 03:06:15 +01:00
Matthew Hodgson
49f0a06238
experiment with additionalProperties some more
2018-09-01 03:03:51 +01:00
Matthew Hodgson
f6326030ba
backtick asterisk
2018-09-01 03:02:46 +01:00
Matthew Hodgson
7430c3b56f
experiment with additionalProperties
2018-09-01 03:01:41 +01:00
Matthew Hodgson
337041610f
one slash?
2018-09-01 02:53:15 +01:00
Matthew Hodgson
b8608495e9
periods
2018-09-01 02:51:24 +01:00
Matthew Hodgson
a842e0433d
try escaping the asterisk
2018-09-01 02:50:32 +01:00
Matthew Hodgson
42b11e096f
Review
2018-09-01 02:48:37 +01:00
Matthew Hodgson
db302b66ca
revert example which was corect first time; fix rst
2018-09-01 02:44:53 +01:00
Matthew Hodgson
2c0b45fd14
fix example?
2018-09-01 02:41:53 +01:00
Matthew Hodgson
0f9a23c471
swaggerify to-device
2018-09-01 02:37:31 +01:00
Matthew Hodgson
0ee2cf6286
fix device_list_update example hopefully
2018-09-01 02:14:36 +01:00
Matthew Hodgson
0afdcc59ea
spell out stream_id and fix todo
2018-09-01 02:10:45 +01:00
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
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
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
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
1261da209d
Fix wording for the homeserver not allowing a particular 3pid
2018-08-31 14:38:22 -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
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
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
f6d9e53f5c
Clarify that homeserver must reject clients from setting m.fully_read
2018-08-31 11:13:32 -06:00
Travis Ralston
679ddabb53
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/read-markers
2018-08-31 10:34:19 -06:00
Travis Ralston
a4c2b2b905
General clarity and spelling for the requestToken APIs
2018-08-31 10:32:30 -06:00
Travis Ralston
7f1b94c211
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/id-server
2018-08-31 10:29:09 -06:00
Travis Ralston
e3ad253dca
A sender is also required for the invite_state
2018-08-31 09:44:29 -06:00
Travis Ralston
2f824df8dd
Define the real event types on the invite_state
2018-08-31 09:43:29 -06:00
Travis Ralston
2e3e189ea2
Merge remote matrix-org/master
2018-08-31 09:31:39 -06:00
Travis Ralston
38ae166e9d
Merge pull request #1505 from turt2live/travis/general/3pid_invite
...
Clarify how third party invites work
2018-08-31 08:38:40 -06:00
Travis Ralston
afa16f1e4e
Merge pull request #1606 from turt2live/travis/c2s/room-tags
...
Update the room tagging documentation
2018-08-31 08:36:40 -06:00
Travis Ralston
73736d41db
Merge pull request #1569 from turt2live/travis/c2s/user-directory
...
Clarify the homeserver's behaviour for user searching
2018-08-31 08:32:02 -06:00