Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-21 08:58:38 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix membership on third-party invite upgrade (#995)

Browse source
This commit is contained in:
Brendan Abolivier 2017-09-26 15:57:51 +02:00 committed by Richard van der Hoff
parent a7c28fdf43
commit 0b74492d67
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/client_server.rst
View file

@ -55,6 +55,8 @@
spec and update the JSON of the request sent by the identity server upon 3PID spec and update the JSON of the request sent by the identity server upon 3PID
binding binding
(`#997 <https://github.com/matrix-org/matrix-doc/pull/997>`) (`#997 <https://github.com/matrix-org/matrix-doc/pull/997>`)
- Fix "membership" property on third-party invite upgrade example
(`#995 <https://github.com/matrix-org/matrix-doc/pull/995>`)
- Fix response format and 404 example for room alias lookup - Fix response format and 404 example for room alias lookup
(`#960 <https://github.com/matrix-org/matrix-doc/pull/960>`) (`#960 <https://github.com/matrix-org/matrix-doc/pull/960>`)
- Fix examples of ``m.room.member`` event and room state change, - Fix examples of ``m.room.member`` event and room state change,

2
event-schemas/examples/m.room.member#third_party_invite
View file

@ -1,7 +1,7 @@
{ {
"age": 242352, "age": 242352,
"content": { "content": {
"membership": "join", "membership": "invite",
"avatar_url": "mxc://localhost/SEsfnsuifSDFSSEF#auto", "avatar_url": "mxc://localhost/SEsfnsuifSDFSSEF#auto",
"displayname": "Alice Margatroid", "displayname": "Alice Margatroid",
"third_party_invite": { "third_party_invite": {