Richard van der Hoff
1028ea3558
doc style: lists
2018-02-06 17:30:22 +00:00
Richard van der Hoff
3c40d5a94e
documentation_style: fix indentation
2018-02-06 16:10:55 +00:00
Richard van der Hoff
306783b7bf
notes on doc style
2018-02-06 16:09:53 +00:00
Richard van der Hoff
91c1d9ed58
documentation_style.rst: Fix rst syntax
...
apparently the rst parser gets confused by '- `````'.
2018-02-06 14:58:59 +00:00
Richard van der Hoff
96fa29ad03
Merge pull request #1109 from t3chguy/t3chguy/search_defaults
...
Document the defaults for the /search API
2018-02-06 15:42:47 +01:00
Michael Telatynski
436e2cd318
Add changelog entry for /search API default value clarifications
2018-01-30 21:30:02 +00:00
Michael Telatynski
06911d4fab
Merge branch 'master' of https://github.com/matrix-org/matrix-doc into t3chguy/search_defaults
2018-01-30 21:29:06 +00:00
Michael Telatynski
dc27323d8b
Document the defaults for the /search API
2018-01-30 14:29:59 +00:00
Richard van der Hoff
59e4c625b3
Merge pull request #1093 from CromFr/guest_can_join
...
Add createRoom guest_can_join parameter
2018-01-24 20:42:08 +00:00
Richard van der Hoff
6a03a43b16
Merge pull request #1107 from musoke/patch-1
...
Typo in client-server spec: ether -> either
2018-01-23 18:51:24 +00:00
Nathan Musoke
7e94cd5a0b
Typo in client-server spec: ether -> either
2018-01-20 19:15:01 +13:00
David Baker
849a7662fe
Fix changelog, hopefully
2018-01-18 16:08:18 +00:00
David Baker
46b0288ea5
Merge pull request #1106 from matrix-org/dbkr/fix_keys_changes
...
Fix /keys/changes response to reflect reality
2018-01-17 16:07:04 +00:00
David Baker
fa0eb2405f
all rooms, not any, and remove extra words
2018-01-17 11:25:09 +00:00
David Baker
2a9a9e757e
add changelog
2018-01-17 11:20:26 +00:00
David Baker
ca09415e80
Fix /keys/changes response to reflect reality
2018-01-17 11:16:48 +00:00
Richard van der Hoff
2e684bcc4b
fix readme typo
2018-01-15 09:13:31 +00:00
David Baker
7c6a97e82c
Add PR 1104 to changelog
2018-01-10 17:57:00 +00:00
David Baker
573b25ab9c
Merge pull request #1104 from matrix-org/dbkr/keys_query_token
...
Doc /keys/query 'token' param
2018-01-10 17:52:58 +00:00
David Baker
bb0bbedb87
indenting
2018-01-10 17:46:25 +00:00
David Baker
1674b0e3b5
Doc /keys/query 'token' param
2018-01-10 17:43:35 +00:00
Richard van der Hoff
73118b6b29
Merge pull request #1096 from t3chguy/user_directory
...
add user_directory
2017-12-29 15:57:59 +00:00
Richard van der Hoff
3bb316aff5
Merge pull request #1099 from matrix-org/rav/send_join_auth_chain
...
send_join: clarify auth_chain description
2017-12-29 15:44:40 +00:00
Michael Telatynski
784adade9b
changes based on Pull Request feedback
2017-12-21 17:45:26 +00:00
Richard van der Hoff
15ca952cc3
remove spurious word
2017-12-20 10:10:02 +00:00
Richard van der Hoff
1fb7647021
send_join: clarify auth_chain description
...
The auth_chain field should contain all of the auth events required to auth the
state events, as well as those required to auth the join event itself.
(cf e148438/synapse/handlers/federation.py (L1076-L1077)
2017-12-18 17:58:35 +00:00
Michael Telatynski
3d8fe6e090
merge profiles with user directory into user data, also fix typo
2017-12-18 17:01:52 +00:00
Michael Telatynski
605510e965
Merge branch 'master' into user_directory
2017-12-18 16:56:04 +00:00
Michael Telatynski
d219cbc978
apply points from review
2017-12-18 16:54:11 +00:00
Richard van der Hoff
6d0eb2e9d1
Merge pull request #1097 from matrix-org/rav/deprecate_home_server
...
Mark `home_server` field deprecated
2017-12-18 16:39:42 +00:00
Richard van der Hoff
f91111c54b
Merge pull request #1098 from matrix-org/rav/no_colon_in_mxid
...
Forbid colons in MXIDs
2017-12-18 15:18:28 +00:00
Richard van der Hoff
00b28495a6
Explain how to split an mxid
2017-12-18 14:48:56 +00:00
Richard van der Hoff
a36f8ba00d
Forbid colons in MXIDs
...
There is a single (AS) user on matrix.org who has a colon in their localpart,
but I suspect that is an artifact of old bridge code and won't work over
federation anyway.
Colons in MXIDs are particularly harmful because they make it impossible to
split mxids into local- and remote-parts
2017-12-18 14:16:25 +00:00
Richard van der Hoff
6a524be585
changelog
2017-12-18 13:37:30 +00:00
Richard van der Hoff
d9a4ddbf65
Mark home_server field deprecated
...
This is spelt wrong, and is redundant to user_id, so let's stop people using
it.
2017-12-18 13:34:26 +00:00
Michael Telatynski
b80f38e11b
fix changelog entry
2017-12-18 13:30:37 +00:00
Michael Telatynski
1f7d4cd9d0
add changelog entry
2017-12-17 23:45:55 +00:00
Michael Telatynski
97445195f6
add user_directory
2017-12-17 23:42:44 +00:00
Richard van der Hoff
f0f91bd9bc
Merge pull request #1095 from gergelypolonkai/master
...
Fix example in email based registration endpoint
2017-12-15 13:11:01 +00:00
Gergely Polonkai
e9622bf9e4
Fix example in email based registration endpoint
...
The spec says `send_attempt` should be a number, but the example shows it as a string.
Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>
2017-12-15 13:14:26 +01:00
Thibaut CHARLES
42c1031cdf
updated changelog
2017-12-13 16:26:09 +01:00
Richard van der Hoff
66e545d8a1
Merge pull request #1092 from CromFr/master
...
createRoom StateEvent.content should be an object
2017-12-13 14:52:06 +00:00
Crom (Thibaut CHARLES)
b270233549
Add createRoom guest_can_join parameter
2017-12-13 14:12:27 +01:00
Thibaut CHARLES
5e2a48f709
createRoom StateEvent.content should be an object
2017-12-13 00:01:26 +01:00
Richard van der Hoff
08d137a588
We sign the request body, not the JSON
...
when signing federation requests, we put the actual request body into the
canonicaljson to be signed, not the JSON representation of it.
2017-12-10 23:09:12 +00:00
Richard van der Hoff
0a540bf544
Merge pull request #1085 from matrix-org/rav/state_resolution
...
Document the state resolution algorithm
2017-12-10 23:08:30 +00:00
Richard van der Hoff
56f878842c
Add a warning that state resolution has problems
2017-12-10 23:05:55 +00:00
Richard van der Hoff
37eca87115
Merge pull request #1091 from CromFr/master
...
Typo on dump-swagger.py script path in readme
2017-12-10 22:45:36 +00:00
Crom (Thibaut CHARLES)
eff9da89ea
Typo on dump-swagger.py script path in readme
2017-12-09 00:21:14 +01:00
Richard van der Hoff
4adeb0d6fe
Merge branch 'client_server/r0.3.0_updates'
2017-11-27 14:59:41 +00:00
