57571ea4ce
Merge branch 'master' of github.com:matrix-org/matrix-doc into notifications/room
2018-08-16 23:09:59 +01:00
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
2018-07-10 12:52:11 -06:00
992bc8828a
Merge branches 'master' and 'notifications/room' of github.com:matrix-org/matrix-doc into notifications/room
2018-05-12 09:24:53 +01:00
1e656d836e
spec notifications key on power level event and provide @room in example
2018-04-15 22:35:44 +01:00
8d05f80cec
Sticker messages (m.sticker) ( #1158 )
2018-03-27 10:00:41 +01:00
af74790681
Merge remote-tracking branch 'matrix-org/master' into travis/m.ignored_user_list
2018-03-06 10:18:24 -07:00
eb8c3255bf
Remove extraneous comma from m.presence schema
...
This causes the build to fail. Fixes #1146
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-03-05 18:45:57 -07:00
d37ed0876f
Merge branch 'master' into travis/m.ignored_user_list
2018-03-05 14:52:37 -07:00
a0dda3cae2
Merge branch 'master' into travis/m.tag
2018-03-05 18:58:53 +00:00
e862ef60ae
Spec ignoring users
...
Adds https://github.com/matrix-org/matrix-doc/issues/528
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-03-03 15:39:10 -07:00
a3f006353c
Tag ordering is defined as a number between 0 and 1, not strings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-03-03 12:40:48 -07:00
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>
2018-03-03 12:12:47 -07:00
a1265a274b
Add spec for m.room.pinned_events
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 11:59:27 -06:00
0b74492d67
Fix membership on third-party invite upgrade ( #995 )
2017-09-26 14:57:51 +01:00
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 )
2017-07-31 12:04:24 +02:00
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
2017-07-14 15:30:56 +01:00
852f4edead
redacts is an eventID not a roomID (! -> $)
2017-07-05 16:18:49 +01:00
05001bcaa6
Fix whitepace
2016-11-07 14:32:48 +00:00
29e33deeb5
Fix m.location example
2016-11-07 14:31:29 +00:00
85bc989c02
pr feedback
2016-10-04 15:07:14 +01:00
cade909e25
Fix inconsistencies regarding redacted_because
...
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
2016-08-30 21:18:55 -07:00
4f37e4ece0
Merge pull request #342 from matrix-org/erikj/presence
...
Fix and correctly document presence's currently_active
2016-06-29 11:36:55 +01:00
c83940750c
Update m.presence
2016-06-29 10:42:33 +01:00
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
2016-06-22 17:45:49 +01:00
ea170e5dca
m.third_party_invite: Allow multiple public keys
2016-02-12 13:15:21 +00:00
9bfe86f474
Add display_name to 3pid invites in m.room.member
2015-12-17 19:01:20 +01:00
aa4ed10821
Unify v1 and v2 event schemas
2015-12-01 17:23:58 +00:00
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.
2015-11-30 11:22:57 +00:00
c5f457cee9
Merge pull request #132 from matrix-org/markjh/room_tags
...
Document a v2 api for setting tags on rooms
2015-11-27 15:31:54 +00:00
3b390bff3c
Merge branch 'master' into markjh/room_tags
...
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
2015-11-16 16:56:35 +00:00
071edcd86e
Merge branch 'master' into daniel/multipleexamples
2015-11-10 13:22:35 +00:00
e72151f2c3
Specify guest room access
...
This was reviewed as PR #150 and merged from daniel/anonymousaccess
2015-11-06 18:15:21 +00:00
161441fa3a
Update 3pid spec based on new implementation
2015-11-05 18:11:20 +00:00
d53814097f
Add example content to the tags in example tag events
2015-11-03 15:57:06 +00:00
52f55e0542
Allow room tags to have asssociated content, and return that content in the m.tag events
2015-11-02 13:31:25 +00:00
9f4d81308d
Pull out separate invite_room_state example
2015-10-30 16:21:50 +00:00
176f919fc8
Show multiple examples where present
2015-10-28 15:00:53 +00:00
b92a0f2b4d
Remove extra trailing comma
2015-10-28 14:49:41 +00:00
81a60a25cc
Update 3pid spec based on new implementation
2015-10-28 14:46:10 +00:00
12e33a3b09
Document a v2 api for setting tags on rooms
2015-10-26 16:14:24 +00:00
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
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
ae90d15b3c
Add m.room.avatar
2015-10-19 10:46:07 +01:00
6161a920b6
Update 3pid invite section to reflect signed property
2015-10-16 18:29:20 +01:00
a8d8412068
Add invite_room_state example.
2015-10-16 16:48:18 +01:00
21a40b317d
Merge branch 'master' into daniel/threepidinvites-2
2015-10-08 09:41:17 -05:00
ead79614ff
Merge pull request #78 from matrix-org/module-typing2
...
Typing module
2015-10-02 14:36:30 +01:00
9d8dc7971d
Review comments
2015-10-02 08:33:12 -05:00
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
c972dad8b3
Flesh out receipts module. Add receipts swagger
...
Add templating support for v2 apis.
2015-10-01 15:41:54 +01:00
2b7e02c080
Add sections for typing. Add swagger, JSON schema and example m.typing event
2015-09-30 15:51:04 +01:00
3011823c51
Merge pull request #27 from matrix-org/receipts
...
Document receipts
2015-09-10 16:18:19 +01:00
e58f816ad3
Add m.receipt schema
2015-09-08 16:49:14 +01:00
5e7665054e
Merge pull request #28 from matrix-org/history_visibility
...
Document m.room.history_visibility
2015-09-04 13:33:51 +01:00
b4c2cba406
State key should be empty
2015-09-04 13:31:51 +01:00
c6d143447b
Add schemas
2015-09-04 13:27:01 +01:00
40f037da55
Get the right type
2015-09-04 11:54:53 +01:00
03b8c7a12b
Document the canonical alias event
2015-09-04 11:43:11 +01:00
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
59168df363
Add schema/example files for all specced msgtypes.
2015-05-27 15:32:22 +01:00
e62e7b95cd
Rename msgtype examples to have # separator
2015-05-20 12:52:52 +01:00
c61223fb27
Add title/desc to lots of event schemas, add missing keys (e.g. avatar_url, displayname), add required keys section to spec.
2015-05-19 16:49:20 +01:00
9fd57c6fe6
Namespace all the things to v1.
2015-05-19 15:28:08 +01:00
b4d245bce3
Add m.call.invite/candidates/answer/hangup
2015-05-18 17:54:17 +01:00
6f842da227
Add redaction, feedback and presence events.
2015-05-18 17:28:38 +01:00
c78088cfd1
Add m.room.aliases/create/join_rules/member/power_levels
2015-05-18 17:10:11 +01:00
5216b1ac8a
Add m.room.topic. Add title/descs. Add 'type' key checking.
2015-05-18 16:52:03 +01:00
8ec10bbdf2
Add m.room.name and state_key core schema.
2015-05-18 16:21:09 +01:00
a8af9bef29
Add example events.
...
These can be used for assertions as well as drop ins for the spec.
2015-05-18 16:13:41 +01:00
Michael Telatynski