Commit Graph

121 Commits (c3289614da17abde2c02006dd85127d8b26ef045)

Author SHA1 Message Date
Valentin Deniaud 3a8d13df60 add missing m.room.encryption properties 6 years ago
Valentin Deniaud e5005b2d0f document E2E events
This was written by Richard van der Hoff.
6 years ago
Michael Telatynski 57571ea4ce
Merge branch 'master' of github.com:matrix-org/matrix-doc into notifications/room 6 years ago
Travis Ralston 55e4e90ab1 Document message formats as-is
This is likely to later be replaced by mixins, however this is being documented now so clients aren't left in the dark.

Fixes https://github.com/matrix-org/matrix-doc/issues/917
6 years ago
Michael Telatynski 992bc8828a
Merge branches 'master' and 'notifications/room' of github.com:matrix-org/matrix-doc into notifications/room 6 years ago
Michael Telatynski 1e656d836e
spec notifications key on power level event and provide @room in example 6 years ago
Richard Lewis 8d05f80cec Sticker messages (m.sticker) (#1158) 6 years ago
Travis Ralston af74790681 Merge remote-tracking branch 'matrix-org/master' into travis/m.ignored_user_list 6 years ago
Travis Ralston eb8c3255bf Remove extraneous comma from m.presence schema
This causes the build to fail. Fixes #1146

Signed-off-by: Travis Ralston <travpc@gmail.com>
6 years ago
Travis Ralston d37ed0876f
Merge branch 'master' into travis/m.ignored_user_list 6 years ago
Richard van der Hoff a0dda3cae2
Merge branch 'master' into travis/m.tag 6 years ago
Travis Ralston e862ef60ae Spec ignoring users
Adds https://github.com/matrix-org/matrix-doc/issues/528

Signed-off-by: Travis Ralston <travpc@gmail.com>
6 years ago
Travis Ralston a3f006353c Tag ordering is defined as a number between 0 and 1, not strings
Signed-off-by: Travis Ralston <travpc@gmail.com>
6 years ago
Travis Ralston a488bd5503 Make m.presence match what synapse returns
Considering this is the behaviour that is embedded into most client libraries and the most popular homeserver, it should be adopted as the standard.

Signed-off-by: Travis Ralston <travpc@gmail.com>
6 years ago
Travis Ralston a1265a274b Add spec for m.room.pinned_events
Signed-off-by: Travis Ralston <travpc@gmail.com>
7 years ago
Brendan Abolivier 0b74492d67 Fix membership on third-party invite upgrade (#995) 7 years ago
krombel f8ce497bd6 Fix inconsistency: `join_rules` => `join_rule`
All other docs do not have `join_rules` but `join_rule`
This PR fix this inconsistency.

Mentioned by @digital:sorunome.de in [#matrix-dev:matrix.org](https://matrix.to/#/!XqBunHwQIXUiqCaoxq:matrix.org/$150142347531959wjGGm:sorunome.de)
7 years ago
Brendan Abolivier 750d980bc0 Room member (#950)
* Fixed an incorrect membership on example
* Added precision on membership upon profile update
* Changed first example into a join
* Changed the state/{eventType}/{stateKey} example with an actual state key
7 years ago
Michael Telatynski 852f4edead redacts is an eventID not a roomID (! -> $) 7 years ago
Mark Haines 05001bcaa6 Fix whitepace 8 years ago
Mark Haines 29e33deeb5 Fix m.location example 8 years ago
David Baker 85bc989c02 pr feedback 8 years ago
Benjamin Saunders cade909e25 Fix inconsistencies regarding redacted_because
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
8 years ago
Richard van der Hoff 4f37e4ece0 Merge pull request #342 from matrix-org/erikj/presence
Fix and correctly document presence's currently_active
8 years ago
Erik Johnston c83940750c Update m.presence 8 years ago
Richard van der Hoff adb5768731 m.room.power_levels: clarify documentation
- clarify description and add text for invite, ban, etc.
- the keys aren't required. Document their defaults
- add 'invite' to example
8 years ago
Daniel Wagner-Hall ea170e5dca m.third_party_invite: Allow multiple public keys 9 years ago
Daniel Wagner-Hall 9bfe86f474 Add display_name to 3pid invites in m.room.member 9 years ago
Daniel Wagner-Hall aa4ed10821 Unify v1 and v2 event schemas 9 years ago
Daniel Wagner-Hall 6c66bfc755 Flatten out v1 and v2_alpha directories
As a side effect, I got rid of all of the horrible symlinks and just put
in all of the proper relative paths. Because the horrible symlinks were
horrible.
9 years ago
Mark Haines c5f457cee9 Merge pull request #132 from matrix-org/markjh/room_tags
Document a v2 api for setting tags on rooms
9 years ago
Mark Haines 3b390bff3c Merge branch 'master' into markjh/room_tags
Conflicts:
	api/client-server/v1/rooms.yaml
	specification/targets.yaml
9 years ago
Daniel Wagner-Hall 071edcd86e Merge branch 'master' into daniel/multipleexamples 9 years ago
Daniel Wagner-Hall e72151f2c3 Specify guest room access
This was reviewed as PR #150 and merged from daniel/anonymousaccess
9 years ago
Daniel Wagner-Hall 161441fa3a Update 3pid spec based on new implementation 9 years ago
Mark Haines d53814097f Add example content to the tags in example tag events 9 years ago
Mark Haines 52f55e0542 Allow room tags to have asssociated content, and return that content in the m.tag events 9 years ago
Daniel Wagner-Hall 9f4d81308d Pull out separate invite_room_state example 9 years ago
Daniel Wagner-Hall 176f919fc8 Show multiple examples where present 9 years ago
Daniel Wagner-Hall b92a0f2b4d Remove extra trailing comma 9 years ago
Daniel Wagner-Hall 81a60a25cc Update 3pid spec based on new implementation 9 years ago
Mark Haines 12e33a3b09 Document a v2 api for setting tags on rooms 9 years ago
Kegsay 074c7d480c Merge pull request #113 from matrix-org/invite-room-state
Add invite_room_state to spec
9 years ago
Daniel Wagner-Hall a9a9067d7e Merge pull request #114 from matrix-org/daniel/3pidtosigned
Update 3pid invite section to reflect signed property
9 years ago
Kegan Dougal ae90d15b3c Add m.room.avatar 9 years ago
Daniel Wagner-Hall 6161a920b6 Update 3pid invite section to reflect signed property 9 years ago
Kegan Dougal a8d8412068 Add invite_room_state example. 9 years ago
Daniel Wagner-Hall 21a40b317d Merge branch 'master' into daniel/threepidinvites-2 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 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 c972dad8b3 Flesh out receipts module. Add receipts swagger
Add templating support for v2 apis.
9 years ago
Kegan Dougal 2b7e02c080 Add sections for typing. Add swagger, JSON schema and example m.typing event 9 years ago
Kegsay 3011823c51 Merge pull request #27 from matrix-org/receipts
Document receipts
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 b4c2cba406 State key should be empty 9 years ago
Erik Johnston c6d143447b Add schemas 9 years ago
Erik Johnston 40f037da55 Get the right type 9 years ago
Erik Johnston 03b8c7a12b Document the canonical alias event 9 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.
9 years ago
Kegan Dougal 59168df363 Add schema/example files for all specced msgtypes. 9 years ago
Kegan Dougal e62e7b95cd Rename msgtype examples to have # separator 9 years ago
Kegan Dougal c61223fb27 Add title/desc to lots of event schemas, add missing keys (e.g. avatar_url, displayname), add required keys section to spec. 9 years ago
Kegan Dougal 9fd57c6fe6 Namespace all the things to v1. 9 years ago
Kegan Dougal b4d245bce3 Add m.call.invite/candidates/answer/hangup 9 years ago
Kegan Dougal 6f842da227 Add redaction, feedback and presence events. 9 years ago
Kegan Dougal c78088cfd1 Add m.room.aliases/create/join_rules/member/power_levels 9 years ago
Kegan Dougal 5216b1ac8a Add m.room.topic. Add title/descs. Add 'type' key checking. 9 years ago
Kegan Dougal 8ec10bbdf2 Add m.room.name and state_key core schema. 9 years ago
Kegan Dougal a8af9bef29 Add example events.
These can be used for assertions as well as drop ins for the spec.
9 years ago