wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:matrix-org/matrix-doc

Browse source
This commit is contained in:
Daniel Wagner-Hall 2015-11-05 13:25:51 +00:00
commit 232b10b0f6
11 changed files with 272 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
api/client-server/v1/definitions/push_rule.json
View file

@ -1,4 +1,5 @@
{
"title": "PushRule",
"type": "object",
"properties": {
"default": {
@ -17,4 +18,4 @@
"type": "array"
}
}
}
}

37
api/client-server/v1/definitions/push_ruleset.json
View file

@ -1,60 +1,65 @@
{
"type": "object",
"type": "object",
"properties": {
"content": {
"items": {
"type": "object",
"type": "object",
"title": "PushRule",
"allOf": [
{
"$ref": "push_rule.json"
}
]
},
},
"type": "array"
},
},
"override": {
"items": {
"type": "object",
"type": "object",
"title": "PushRule",
"allOf": [
{
"$ref": "push_rule.json"
}
]
},
},
"type": "array"
},
},
"sender": {
"items": {
"type": "object",
"type": "object",
"title": "PushRule",
"allOf": [
{
"$ref": "push_rule.json"
}
]
},
},
"type": "array"
},
},
"underride": {
"items": {
"type": "object",
"type": "object",
"title": "PushRule",
"allOf": [
{
"$ref": "push_rule.json"
}
]
},
},
"type": "array"
},
},
"room": {
"items": {
"type": "object",
"type": "object",
"title": "PushRule",
"allOf": [
{
"$ref": "push_rule.json"
}
]
},
},
"type": "array"
}
}
}
}

1
api/client-server/v2_alpha/definitions/event_batch.json
View file

@ -5,6 +5,7 @@
"type": "array",
"description": "List of events",
"items": {
"title": "Event",
"type": "object"
}
}

3
api/client-server/v2_alpha/sync.yaml
View file

@ -241,6 +241,9 @@ paths:
"type": "m.room.member",
"state_key": "@bob:example.com",
"content": {"membership": "join"},
"unsigned": {
"prev_content": {"membership": "invite"}
},
"origin_server_ts": 1417731086795
},
"$74686972643033:example.com": {