8fb2bd2927
Fix typo
6 years ago
39f7c77971
Add dot for image file
6 years ago
48d271e58c
Clarifications
6 years ago
463c71af82
Add a note about the examples
6 years ago
b695eb0d17
Clarify example
6 years ago
bc9d205079
Make lines bold
6 years ago
a8bd2f32fd
Update example
6 years ago
8a3e7b751c
Add missing apostrophe
6 years ago
7782781442
Update wording to be betterer
...
Co-Authored-By: erikjohnston <erikj@jki.re>
6 years ago
612d8a66ef
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
6 years ago
f06455479d
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
6 years ago
539ca4cf15
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
6 years ago
c581c6132e
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
6 years ago
eaaf36edf7
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
6 years ago
6c9a433805
Add example of rejected events getting into state
6 years ago
a80ff2f69f
Don't use rejected auth events
6 years ago
b8a8d132b2
Note why convergence is desirable
6 years ago
a6aab378f5
Typo
6 years ago
1f1ba28629
ACTUALLY! Let's just accept rejected events, because what's the worst that can happen?!
6 years ago
25fb09b991
Fix up formatting
6 years ago
40d943f584
Clarify 'auth difference' definition
6 years ago
4df346a12d
Add metadata about update
6 years ago
4790432e50
Update rejected events discussion
6 years ago
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.
6 years ago
db4de5022b
Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc
6 years ago
1fc6465168
remove archaic port 8448 from matrix.org URL for swagger-ui
6 years ago
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
6 years ago
818b48cbbb
make_leave returns an `event` field too
6 years ago
e17dd12007
make_join returns its event under an `event` key
6 years ago
16bbf46b2e
Merge pull request #1656 from turt2live/travis/s2s/simplified-pl-rules
...
Power levels always have a default of 50 for state_default
6 years ago
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
6 years ago
6dab4b28f8
Merge pull request #1648 from matrix-org/matthew/device_list_update
...
document device list synchronisation over federation.
6 years ago
334c69bcda
wording fix
6 years ago
ccbc88ee5d
reword to spell out to when device list updates should be sent
6 years ago
bcd48ebbec
Merge pull request #1610 from uhoreg/reloaded
...
document new state resolution algorithm
6 years ago
8a949af23a
Merge pull request #1650 from mujx/use-example-org
...
Use example.org on examples instead of domain.com which is a real domain
6 years ago
192a6c2ab9
Use example.org on examples instead of domain.com which is a real domain
...
Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com>
6 years ago
ee5e519885
device list is 2 words
6 years ago
e9e3afbd34
clarify who servers should send m.device_list_update EDUs to
6 years ago
9e82b18e24
Merge pull request #1649 from matrix-org/matthew/to-device
...
swaggerify to-device messages
6 years ago
928fc5cbe5
incorporate review
6 years ago
43f2819702
switch to travis' example
6 years ago
49f0a06238
experiment with additionalProperties some more
6 years ago
f6326030ba
backtick asterisk
6 years ago
7430c3b56f
experiment with additionalProperties
6 years ago
337041610f
one slash?
6 years ago
b8608495e9
periods
6 years ago
a842e0433d
try escaping the asterisk
6 years ago
42b11e096f
Review
6 years ago
d25f4412d4
improve wording
6 years ago
Erik Johnston