Merge remote-tracking branch 'matrix-org/master' into travis/releases/push-gateway/r0.1.0
This commit is contained in:
commit
2ab2f91088
117 changed files with 3382 additions and 686 deletions
|
@ -1,6 +1,6 @@
|
|||
{% import 'tables.tmpl' as tables -%}
|
||||
|
||||
``{{definition.title}}`` Schema
|
||||
``{{definition.title}}`` schema
|
||||
{{(11 + definition.title | length) * title_kind}}
|
||||
|
||||
{% if 'description' in definition %}
|
||||
|
|
|
@ -876,15 +876,6 @@ class MatrixUnits(Units):
|
|||
Units.prop(json_schema, "properties/content")
|
||||
)
|
||||
|
||||
# This is horrible because we're special casing a key on m.room.member.
|
||||
# We need to do this because we want to document a non-content object.
|
||||
if schema["type"] == "m.room.member":
|
||||
invite_room_state = get_tables_for_schema(
|
||||
json_schema["properties"]["invite_room_state"]["items"],
|
||||
)
|
||||
schema["content_fields"].extend(invite_room_state)
|
||||
|
||||
|
||||
# grab msgtype if it is the right kind of event
|
||||
msgtype = Units.prop(
|
||||
json_schema, "properties/content/properties/msgtype/enum"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue