8f5783615c
Merge branch 'master' into markjh/client_config
...
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
9 years ago
e72151f2c3
Specify guest room access
...
This was reviewed as PR #150 and merged from daniel/anonymousaccess
9 years ago
161441fa3a
Update 3pid spec based on new implementation
9 years ago
ebc0237109
Add the missing titles to the schema
9 years ago
fba3c04e42
Apparently the spec generator breaks if the title in a schema is too long
9 years ago
bcb8fac53c
Add a description for the tag event
9 years ago
52f55e0542
Allow room tags to have asssociated content, and return that content in the m.tag events
9 years ago
12e33a3b09
Document a v2 api for setting tags on rooms
9 years ago
67880686d5
Allow history to be noted as world-readable
...
SPEC-237
9 years ago
074c7d480c
Merge pull request #113 from matrix-org/invite-room-state
...
Add invite_room_state to spec
9 years ago
a9a9067d7e
Merge pull request #114 from matrix-org/daniel/3pidtosigned
...
Update 3pid invite section to reflect signed property
9 years ago
bbd3f8072c
Review comments
9 years ago
f51e031066
Fix JSON
9 years ago
ae90d15b3c
Add m.room.avatar
9 years ago
a38e0862cf
Fix required field names
9 years ago
6161a920b6
Update 3pid invite section to reflect signed property
9 years ago
83d21484df
Oopsie
9 years ago
d39a9082a0
Add invite_room_state to spec. Flesh out info.
9 years ago
604e268add
Merge pull request #105 from matrix-org/spec-177-events-max-len
...
Add in size limits as per SPEC-222
9 years ago
c5dc383668
Merge pull request #85 from matrix-org/module-im
...
Instant messaging module
9 years ago
6a0595bc46
Add in size limits as per SPEC-222
9 years ago
4170dbd5cf
Review comments
9 years ago
dc3c02aff5
Review comments
9 years ago
21a40b317d
Merge branch 'master' into daniel/threepidinvites-2
9 years ago
8e5c832ff9
Flesh out more of the IM module
9 years ago
3b4c3522e6
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/disable_federation
9 years ago
ead79614ff
Merge pull request #78 from matrix-org/module-typing2
...
Typing module
9 years ago
9d8dc7971d
Review comments
9 years ago
9cda004848
Fix ref
9 years ago
fdccf35c47
Banish more tabs
9 years ago
e996933a29
Banish the tabs
9 years ago
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
1520f3647f
Merge branch 'master' into module-typing2
...
Conflicts:
specification/modules/typing_notifications.rst
9 years ago
c972dad8b3
Flesh out receipts module. Add receipts swagger
...
Add templating support for v2 apis.
9 years ago
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
9964dd1401
Make explicit the state event only includes some keys
9 years ago
2b7e02c080
Add sections for typing. Add swagger, JSON schema and example m.typing event
9 years ago
7b4c8a9f68
Indicate default for m.federate key
9 years ago
affc2cfc92
Add 'm.federate' flag to 'm.room.create;
9 years ago
d7d9f406a6
Bundle some state into invites
9 years ago
6a2c4d27fc
Update the docs for room v1 api
9 years ago
f33c0846c3
Merge remote-tracking branch 'origin/master' into markjh/document_v1_rooms_api
9 years ago
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
654ed9b99e
Remove keys from the m.room.* schema files so that they may be used in the node swagger validator
9 years ago
fd3401fc7a
Remove accidentally committed swp file
9 years ago
d0b018c46e
Fix syntax error in JSON
9 years ago
c49338006a
replace definitions/*event.yaml with symlinks to /event-schemas/
9 years ago
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
3011823c51
Merge pull request #27 from matrix-org/receipts
...
Document receipts
9 years ago
500b4eb32d
Typo
9 years ago
Mark Haines