Commit Graph

60 Commits (f02c33738fda50a52eacacef8ce2206197764abd)

Author SHA1 Message Date
Daniel Wagner-Hall dc3c02aff5 Review comments 9 years ago
Daniel Wagner-Hall 21a40b317d Merge branch 'master' into daniel/threepidinvites-2 9 years ago
Erik Johnston 3b4c3522e6 Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/disable_federation 9 years ago
Kegsay ead79614ff Merge pull request #78 from matrix-org/module-typing2
Typing module
9 years ago
Daniel Wagner-Hall 9d8dc7971d Review comments 9 years ago
Daniel Wagner-Hall 9cda004848 Fix ref 9 years ago
Daniel Wagner-Hall fdccf35c47 Banish more tabs 9 years ago
Daniel Wagner-Hall e996933a29 Banish the tabs 9 years ago
Daniel Wagner-Hall af7d2ca9fc Update 3pid invite spec
This takes into account:
 1) That finding the existing servers of a room is hard
 2) Federation
9 years ago
Kegan Dougal 1520f3647f Merge branch 'master' into module-typing2
Conflicts:
	specification/modules/typing_notifications.rst
9 years ago
Kegan Dougal c972dad8b3 Flesh out receipts module. Add receipts swagger
Add templating support for v2 apis.
9 years ago
Kegan Dougal 365a9076b9 Add nested dict template support; Add x-pattern
For cases where event schema specify `patternProperties` it would be nice
to give that pattern a "human-readable" form rather than a raw regex. This
is now supported by specifying `x-pattern` in the value part of the specified
pattern e.g. `patternProperties:{ "^.*":{ x-pattern: "$THING", ... } }`

Templating had limited record type descriptions limited to value primitives
e.g. `{string: integer}`. It now supports inspecting the values recursively
if the value is `object`.

Updated `m.receipt` to take both these points into account to make it read
better. Tweak receipt module text.
9 years ago
Erik Johnston 9964dd1401 Make explicit the state event only includes some keys 9 years ago
Kegan Dougal 2b7e02c080 Add sections for typing. Add swagger, JSON schema and example m.typing event 9 years ago
Erik Johnston 7b4c8a9f68 Indicate default for m.federate key 9 years ago
Erik Johnston affc2cfc92 Add 'm.federate' flag to 'm.room.create; 9 years ago
Erik Johnston d7d9f406a6 Bundle some state into invites 9 years ago
Mark Haines 6a2c4d27fc Update the docs for room v1 api 9 years ago
Mark Haines f33c0846c3 Merge remote-tracking branch 'origin/master' into markjh/document_v1_rooms_api 9 years ago
Mark Haines 7f81501762 Allow relative references to schema to work in python and node.
Rename "schema/v1/core" to "schema/v1/core-event-schema".
Add self-referential symlinks to schema/v1/core-event-schema

The python json schema libraries expect that relative references are
relative to the file they are in. The node json schema libraries
expect that relateive references are relative to the first file loaded.

To support both kinds we reference the core event schema using
"core-event-schema/event.json". We then symlink the core-event-schema
directory to both the location of the file refering to "event.json" so
that it will work in python and to the location of the top level file
so that it will work in node.
9 years ago
Mark Haines 654ed9b99e Remove keys from the m.room.* schema files so that they may be used in the node swagger validator 9 years ago
Mark Haines fd3401fc7a Remove accidentally committed swp file 9 years ago
Mark Haines d0b018c46e Fix syntax error in JSON 9 years ago
Mark Haines c49338006a replace definitions/*event.yaml with symlinks to /event-schemas/ 9 years ago
Mark Haines 6147562d14 Split the "core" definition files into separate files. To
make it easier to use the schema files with tools that
don't support deep links.
9 years ago
Kegsay 3011823c51 Merge pull request #27 from matrix-org/receipts
Document receipts
9 years ago
Erik Johnston 500b4eb32d Typo 9 years ago
Erik Johnston 53756cfd73 More commas 9 years ago
Erik Johnston 5157c2f52e More escapes 9 years ago
Erik Johnston e58f816ad3 Add m.receipt schema 9 years ago
Kegsay 5e7665054e Merge pull request #28 from matrix-org/history_visibility
Document m.room.history_visibility
9 years ago
Erik Johnston 1e3d9a6a50 Typo 9 years ago
Erik Johnston c6d143447b Add schemas 9 years ago
Erik Johnston 3aabb77cb4 Capitilasation matters 9 years ago
Erik Johnston 61f1424124 No trailing commas 9 years ago
Erik Johnston 03b8c7a12b Document the canonical alias event 9 years ago
Kegan Dougal c3a298a5df Fix sort order for VoIP events. 10 years ago
Kegan Dougal 9abadaf7af Add {{presence_events}} template. 10 years ago
Kegan Dougal 59f856c7e6 Factor out ImageInfo into a core type. Refer to that in other msgtypes.
Add templating for msgtypes. ImageInfo core type is not referred to for
m.image in order for the ImageInfo table to render for it.
10 years ago
Kegan Dougal 59168df363 Add schema/example files for all specced msgtypes. 10 years ago
Kegan Dougal 06177740d4 Tweak how constants are represented. 10 years ago
Kegan Dougal 9d7f2baf5c Mention that knock/private on join_rules are not implemented. 10 years ago
Kegan Dougal 003ca35bf6 Spell 'overridden' correctly. 10 years ago
Kegan Dougal 86be22dc35 s/0-length/zero-length/g 10 years ago
Kegan Dougal 6dcbc40b63 Add common event field descriptions and template. 10 years ago
Kegan Dougal 73d84f3722 Add descriptions to state_keys. Add it into the template. 10 years ago
Kegan Dougal 6a41bd9b82 Add descriptions to event fields 10 years ago
Kegan Dougal a42a22028c Add event table template. Also inspect arrays for objects. 10 years ago
Kegan Dougal 0899e0b772 Update event schema parsing.
The templating system now parses event schemas into a form which
can be easily dumped into multiple tables (for nested object types)
10 years ago
Kegan Dougal bfb6d920d2 Add missing m.call descriptions 10 years ago