Erik Johnston
bc9d205079
Make lines bold
2018-12-13 11:13:14 +00:00
Erik Johnston
a8bd2f32fd
Update example
2018-12-11 10:37:31 +00:00
Erik Johnston
8a3e7b751c
Add missing apostrophe
2018-12-11 10:33:02 +00:00
Richard van der Hoff
7782781442
Update wording to be betterer
...
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:13:45 +00:00
Richard van der Hoff
612d8a66ef
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:12:52 +00:00
Richard van der Hoff
f06455479d
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:12:39 +00:00
Richard van der Hoff
539ca4cf15
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:12:29 +00:00
Richard van der Hoff
c581c6132e
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:12:18 +00:00
Richard van der Hoff
eaaf36edf7
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:11:55 +00:00
Erik Johnston
6c9a433805
Add example of rejected events getting into state
2018-12-10 16:27:45 +00:00
Erik Johnston
a80ff2f69f
Don't use rejected auth events
2018-11-05 09:45:11 +00:00
Erik Johnston
b8a8d132b2
Note why convergence is desirable
2018-11-01 11:41:38 +00:00
Erik Johnston
a6aab378f5
Typo
2018-10-31 15:26:54 +00:00
Erik Johnston
1f1ba28629
ACTUALLY! Let's just accept rejected events, because what's the worst that can happen?!
2018-10-31 15:26:12 +00:00
Erik Johnston
25fb09b991
Fix up formatting
2018-10-30 13:42:18 +00:00
Erik Johnston
40d943f584
Clarify 'auth difference' definition
2018-10-30 11:03:07 +00:00
Erik Johnston
4df346a12d
Add metadata about update
2018-10-30 11:00:47 +00:00
Erik Johnston
4790432e50
Update rejected events discussion
2018-10-09 10:36:43 +01:00
Erik Johnston
3d3b77ea7e
Specify how to handle rejected events in new state res
...
It's possible for events in an an event's auth chain to be rejected due
to not having passed auth (based on the state at the time), so we need
to be explicit about how to handle that case.
2018-10-08 14:25:06 +01:00
Matthew Hodgson
db4de5022b
Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc
2018-10-07 23:25:43 +01:00
Matthew Hodgson
1fc6465168
remove archaic port 8448 from matrix.org URL for swagger-ui
2018-10-07 23:25:32 +01:00
Richard van der Hoff
15eb69cc47
Merge pull request #1691 from matrix-org/rav/fix_make_join_doc
...
make_join and make_leave return their events under an `event` key
2018-10-03 15:22:29 +01:00
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
Travis Ralston
16bbf46b2e
Merge pull request #1656 from turt2live/travis/s2s/simplified-pl-rules
...
Power levels always have a default of 50 for state_default
2018-09-04 12:21:57 -06:00
Travis Ralston
e4a8fed0e8
Power levels always have a default of 50 for state_default
...
As per the proposal https://github.com/matrix-org/matrix-doc/issues/1304
2018-09-04 11:43:37 -06: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
Matthew Hodgson
334c69bcda
wording fix
2018-09-03 16:53:39 +01:00
Matthew Hodgson
ccbc88ee5d
reword to spell out to when device list updates should be sent
2018-09-03 16:49:36 +01:00
Matthew Hodgson
bcd48ebbec
Merge pull request #1610 from uhoreg/reloaded
...
document new state resolution algorithm
2018-09-02 23:53:08 +01:00
Matthew Hodgson
8a949af23a
Merge pull request #1650 from mujx/use-example-org
...
Use example.org on examples instead of domain.com which is a real domain
2018-09-02 23:51:58 +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
e9e3afbd34
clarify who servers should send m.device_list_update EDUs to
2018-09-02 13:00:29 +01:00
Matthew Hodgson
9e82b18e24
Merge pull request #1649 from matrix-org/matthew/to-device
...
swaggerify to-device messages
2018-09-01 03:09:41 +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
d25f4412d4
improve wording
2018-09-01 02:46:05 +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
