Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-01 21:48:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
857 commits 31 branches 42 tags 32 MiB
Commit graph

78 commits

Author SHA1 Message Date
Kegsay 604e268add Merge pull request #105 from matrix-org/spec-177-events-max-len 
Add in size limits as per SPEC-222
 2015-10-15 11:08:28 +01:00
Kegsay c5dc383668 Merge pull request #85 from matrix-org/module-im 
Instant messaging module
 2015-10-15 10:59:41 +01:00
Kegan Dougal 6a0595bc46 Add in size limits as per SPEC-222 2015-10-14 16:15:55 +01:00
Kegan Dougal 4170dbd5cf Review comments 2015-10-13 11:29:54 +01:00
Daniel Wagner-Hall dc3c02aff5 Review comments 2015-10-08 10:08:38 -05:00
Daniel Wagner-Hall 21a40b317d Merge branch 'master' into daniel/threepidinvites-2 2015-10-08 09:41:17 -05:00
Kegan Dougal 8e5c832ff9 Flesh out more of the IM module 2015-10-05 13:45:23 +01:00
Erik Johnston 3b4c3522e6 Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/disable_federation 2015-10-05 09:17:28 +01:00
Kegsay ead79614ff Merge pull request #78 from matrix-org/module-typing2 
Typing module
 2015-10-02 14:36:30 +01:00
Daniel Wagner-Hall 9d8dc7971d Review comments 2015-10-02 08:33:12 -05:00
Daniel Wagner-Hall 9cda004848 Fix ref 2015-10-01 22:27:19 -05:00
Daniel Wagner-Hall fdccf35c47 Banish more tabs 2015-10-01 22:23:24 -05:00
Daniel Wagner-Hall e996933a29 Banish the tabs 2015-10-01 22:21:34 -05:00
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
 2015-10-01 22:19:11 -05:00
Kegan Dougal 1520f3647f Merge branch 'master' into module-typing2 
Conflicts:
	specification/modules/typing_notifications.rst
 2015-10-01 15:47:46 +01:00
Kegan Dougal c972dad8b3 Flesh out receipts module. Add receipts swagger 
Add templating support for v2 apis.
 2015-10-01 15:41:54 +01:00
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.
 2015-10-01 12:11:26 +01:00
Erik Johnston 9964dd1401 Make explicit the state event only includes some keys 2015-09-30 16:11:34 +01:00
Kegan Dougal 2b7e02c080 Add sections for typing. Add swagger, JSON schema and example m.typing event 2015-09-30 15:51:04 +01:00
Erik Johnston 7b4c8a9f68 Indicate default for m.federate key 2015-09-29 16:19:27 +01:00
Erik Johnston affc2cfc92 Add 'm.federate' flag to 'm.room.create; 2015-09-28 16:39:54 +01:00
Erik Johnston d7d9f406a6 Bundle some state into invites 2015-09-25 14:21:50 +01:00
Mark Haines 2efadea583 Merge branch 'master' into markjh/document_v1_rooms_api 2015-09-21 16:35:31 +01:00
Mark Haines 8974b2b67b Skip files that start with ".", e.g. vim swp files. 2015-09-21 15:05:10 +01:00
Mark Haines 6ba9b29b3b Report all the errors in schemas/check_examples, not just the first error. 2015-09-21 15:04:03 +01:00
Mark Haines 52640eb205 Add a python script for checking that the examples match the event 
schema.

Does the same checks as check.sh, but is a *lot* faster making it
suitable for using as a pre-commit hook.

I don't suggest replacing check.sh since it's good to check that the
schema works with multiple implementations of jsonschema.
 2015-09-21 13:02:37 +01:00
Mark Haines 6a2c4d27fc Update the docs for room v1 api 2015-09-18 17:58:44 +01:00
Mark Haines f33c0846c3 Merge remote-tracking branch 'origin/master' into markjh/document_v1_rooms_api 2015-09-18 17:38:03 +01:00
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.
 2015-09-18 11:39:44 +01:00
Mark Haines 654ed9b99e Remove keys from the m.room.* schema files so that they may be used in the node swagger validator 2015-09-17 16:00:06 +01:00
Mark Haines fd3401fc7a Remove accidentally committed swp file 2015-09-17 14:44:17 +01:00
Mark Haines d0b018c46e Fix syntax error in JSON 2015-09-17 14:43:09 +01:00
Mark Haines c49338006a replace definitions/*event.yaml with symlinks to /event-schemas/ 2015-09-17 13:09:35 +01:00
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.
 2015-09-17 10:09:37 +01:00
Kegsay 3011823c51 Merge pull request #27 from matrix-org/receipts 
Document receipts
 2015-09-10 16:18:19 +01:00
Erik Johnston 500b4eb32d Typo 2015-09-08 16:54:14 +01:00
Erik Johnston 53756cfd73 More commas 2015-09-08 16:52:43 +01:00
Erik Johnston 5157c2f52e More escapes 2015-09-08 16:51:08 +01:00
Erik Johnston e58f816ad3 Add m.receipt schema 2015-09-08 16:49:14 +01:00
Kegsay 5e7665054e Merge pull request #28 from matrix-org/history_visibility 
Document m.room.history_visibility
 2015-09-04 13:33:51 +01:00
Erik Johnston b4c2cba406 State key should be empty 2015-09-04 13:31:51 +01:00
Erik Johnston 1e3d9a6a50 Typo 2015-09-04 13:30:11 +01:00
Erik Johnston c6d143447b Add schemas 2015-09-04 13:27:01 +01:00
Erik Johnston 40f037da55 Get the right type 2015-09-04 11:54:53 +01:00
Erik Johnston 3aabb77cb4 Capitilasation matters 2015-09-04 11:53:07 +01:00
Erik Johnston 61f1424124 No trailing commas 2015-09-04 11:51:13 +01:00
Erik Johnston 03b8c7a12b Document the canonical alias event 2015-09-04 11:43:11 +01:00
Kegan Dougal c3a298a5df Fix sort order for VoIP events. 2015-05-28 11:35:18 +01:00
Kegan Dougal 9abadaf7af Add {{presence_events}} template. 2015-05-28 10:36:02 +01:00
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.
 2015-05-27 16:30:11 +01:00