Commit Graph

185 Commits (c1b630e975f2cde0b0101a46b11751dee204c666)

Author SHA1 Message Date
Richard Lewis 8d05f80cec Sticker messages (m.sticker) (#1158) 7 years ago
Travis Ralston 6e7d264bc7 Add clarity to the m.ignored_user_list
Signed-off-by: Travis Ralston <travpc@gmail.com>
7 years ago
Travis Ralston 0835612277 Represent the ignored users event correctly
Signed-off-by: Travis Ralston <travpc@gmail.com>
7 years ago
Travis Ralston af74790681 Merge remote-tracking branch 'matrix-org/master' into travis/m.ignored_user_list 7 years ago
Travis Ralston 331e49bd0d Improve the documentation of ignored users
* Fix the event schema to represent the real world
* Add the module to the spec targets
* Remove incomplete thought from the client behaviour
* Link to the account data API
* Minor word choice changes

Signed-off-by: Travis Ralston <travpc@gmail.com>
7 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>
7 years ago
Travis Ralston d37ed0876f
Merge branch 'master' into travis/m.ignored_user_list 7 years ago
Richard van der Hoff a0dda3cae2
Merge branch 'master' into travis/m.tag 7 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>
7 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>
7 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>
7 years ago
Max Dor 57e5e1e331 Document default room creator PL (#1081) 7 years ago
Richard van der Hoff e5e249dce1 Remove redundant 'Required' annotations from event fields 7 years ago
Richard van der Hoff 23e2f8986c Merge pull request #1026 from matrix-org/rav/power_levels_doc
Clarify what happens when there is no power_levels event
7 years ago
Richard van der Hoff b4e24d443a Clarify what happens when there is no power_levels event 7 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 (! -> $) 8 years ago
Johannes Löthberg c1b375b2ac Clarify that age is generated on the local HS
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
8 years ago
Johannes Löthberg d9894aeffd Make m.notice description use stricter language
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
8 years ago
Mark Haines 6f1c598db8 Make the key orders consistent 8 years ago
Mark Haines 05001bcaa6 Fix whitepace 8 years ago
Mark Haines 29e33deeb5 Fix m.location example 8 years ago
Mark Haines 30f9ea0225 Spelling 8 years ago
Mark Haines 5ccf41bafc Add type: object 8 years ago
Mark Haines 6ecb5d0729 re-order thumbnail keys 8 years ago
Mark Haines 4349982189 Fix path 8 years ago
Mark Haines 2fdca5a995 Add a thumbnail_info common schema, deduplicate m.room.avatar and m.room.message#m.image 8 years ago
Mark Haines 1b661b64dc Move m.location thumbnail_url to be inside info to match m.video 8 years ago
Mark Haines 14d05464ee Move m.file thumbnail_url to be inside info to match m.video 8 years ago
Mark Haines 25b41c7551 Move m.image thumbnail_url to be inside info to match m.video 8 years ago
Richard van der Hoff dfbe416490 Better types for additionalProps
recurse down the definitions for additionalProps, so that the types are better
8 years ago
David Baker 4480553bf9 Move m.direct description to the swagger
Also change the swagger to yaml so I can put that description in it
without having to figure out how to embed that in json.
8 years ago
David Baker b789251f70 More PR feedback 8 years ago
David Baker 8af90bfc21 Clarify 'this room' 8 years ago
David Baker 85bc989c02 pr feedback 8 years ago
David Baker 8fe8bd6a81 Add is_direct to member event spec. 8 years ago
Benjamin Saunders cade909e25 Fix inconsistencies regarding redacted_because
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
8 years ago
Benjamin Saunders 1c02ff5249 Specify requirement of origin_server_ts
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
8 years ago
Richard van der Hoff 49cd65dd58 Add a license to the spec
We're licensing hte spec under ASLv2. Add the LICENSE file, and add the
short-form to as much of the source as is practical right now (adding it to
json source is a massive pita).
8 years ago
Richard van der Hoff d724b6bf75 Make null m.room.name behaviour explicit
PR feedback
8 years ago
Richard van der Hoff be9dccb266 m.room.canonical alias: fix schema syntax 8 years ago
Richard van der Hoff d4194dd24e Clarify the room-naming behaviour
Make behaviour on empty `m.room.name` and `m.room.canonical_alias` events
explicit.
9 years ago
Richard van der Hoff 4f37e4ece0 Merge pull request #342 from matrix-org/erikj/presence
Fix and correctly document presence's currently_active
9 years ago
Erik Johnston c83940750c Update m.presence 9 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
9 years ago
Richard van der Hoff e594132e95 m.room.member: yaml tweak
Quote "string" for consistency with "null"
9 years ago
Richard van der Hoff 5b12e2cfef Convert event schemas to yaml
We've decided to make the event schemas YAML, so we might as well take
advantage of it.

(This conversion was done mostly automatically, except for:
 - s/null/"null"/ in m.room.member
 - reformat description in m.room.power_levels
9 years ago