Daniel Wagner-Hall
b92a0f2b4d
Remove extra trailing comma
2015-10-28 14:49:41 +00:00
Daniel Wagner-Hall
81a60a25cc
Update 3pid spec based on new implementation
2015-10-28 14:46:10 +00:00
Mark Haines
12e33a3b09
Document a v2 api for setting tags on rooms
2015-10-26 16:14:24 +00:00
Daniel Wagner-Hall
67880686d5
Allow history to be noted as world-readable
...
SPEC-237
2015-10-23 14:02:53 +01:00
Kegsay
074c7d480c
Merge pull request #113 from matrix-org/invite-room-state
...
Add invite_room_state to spec
2015-10-21 09:37:44 +01:00
Daniel Wagner-Hall
a9a9067d7e
Merge pull request #114 from matrix-org/daniel/3pidtosigned
...
Update 3pid invite section to reflect signed property
2015-10-19 15:52:50 +01:00
Kegan Dougal
bbd3f8072c
Review comments
2015-10-19 13:28:44 +01:00
Daniel Wagner-Hall
b7355b0fa5
Merge pull request #117 from matrix-org/daniel/jenkins
...
Give useful error if z-schema is missing
2015-10-19 13:24:00 +01:00
Daniel Wagner-Hall
b2aae762fc
Give useful error if z-schema is missing
2015-10-19 12:36:49 +01:00
Daniel Wagner-Hall
f51e031066
Fix JSON
2015-10-19 12:36:10 +01:00
Kegan Dougal
ae90d15b3c
Add m.room.avatar
2015-10-19 10:46:07 +01:00
Daniel Wagner-Hall
a38e0862cf
Fix required field names
2015-10-16 18:56:07 +01:00
Daniel Wagner-Hall
6161a920b6
Update 3pid invite section to reflect signed property
2015-10-16 18:29:20 +01:00
Kegan Dougal
83d21484df
Oopsie
2015-10-16 16:54:40 +01:00
Kegan Dougal
a8d8412068
Add invite_room_state example.
2015-10-16 16:48:18 +01:00
Kegan Dougal
d39a9082a0
Add invite_room_state to spec. Flesh out info.
2015-10-16 16:43:33 +01:00
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
