Commit graph

48 commits

Author SHA1 Message Date
Richard van der Hoff
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
Erik Johnston
c83940750c Update m.presence 2016-06-29 10:42:33 +01:00
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
2016-06-22 17:45:49 +01:00
Daniel Wagner-Hall
ea170e5dca m.third_party_invite: Allow multiple public keys 2016-02-12 13:15:21 +00:00
Daniel Wagner-Hall
9bfe86f474 Add display_name to 3pid invites in m.room.member 2015-12-17 19:01:20 +01:00
Daniel Wagner-Hall
aa4ed10821 Unify v1 and v2 event schemas 2015-12-01 17:23:58 +00:00
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.
2015-11-30 11:22:57 +00:00
Mark Haines
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
Mark Haines
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
Daniel Wagner-Hall
071edcd86e Merge branch 'master' into daniel/multipleexamples 2015-11-10 13:22:35 +00:00
Daniel Wagner-Hall
e72151f2c3 Specify guest room access
This was reviewed as PR #150 and merged from daniel/anonymousaccess
2015-11-06 18:15:21 +00:00
Daniel Wagner-Hall
161441fa3a Update 3pid spec based on new implementation 2015-11-05 18:11:20 +00:00
Mark Haines
d53814097f Add example content to the tags in example tag events 2015-11-03 15:57:06 +00:00
Mark Haines
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
Daniel Wagner-Hall
9f4d81308d Pull out separate invite_room_state example 2015-10-30 16:21:50 +00:00
Daniel Wagner-Hall
176f919fc8 Show multiple examples where present 2015-10-28 15:00:53 +00:00
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
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
ae90d15b3c Add m.room.avatar 2015-10-19 10:46: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
a8d8412068 Add invite_room_state example. 2015-10-16 16:48:18 +01:00
Daniel Wagner-Hall
21a40b317d Merge branch 'master' into daniel/threepidinvites-2 2015-10-08 09:41:17 -05: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
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
c972dad8b3 Flesh out receipts module. Add receipts swagger
Add templating support for v2 apis.
2015-10-01 15:41:54 +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
Kegsay
3011823c51 Merge pull request #27 from matrix-org/receipts
Document receipts
2015-09-10 16:18:19 +01:00
Erik Johnston
e58f816ad3 Add m.receipt schema 2015-09-08 16:49:14 +01:00
Kegsay
5e7665054e Merge pull request #28 from matrix-org/history_visibility
Document m.room.history_visibility
2015-09-04 13:33:51 +01:00
Erik Johnston
b4c2cba406 State key should be empty 2015-09-04 13:31:51 +01:00
Erik Johnston
c6d143447b Add schemas 2015-09-04 13:27:01 +01:00
Erik Johnston
40f037da55 Get the right type 2015-09-04 11:54:53 +01:00
Erik Johnston
03b8c7a12b Document the canonical alias event 2015-09-04 11:43:11 +01:00
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.
2015-05-27 16:30:11 +01:00
Kegan Dougal
59168df363 Add schema/example files for all specced msgtypes. 2015-05-27 15:32:22 +01:00
Kegan Dougal
e62e7b95cd Rename msgtype examples to have # separator 2015-05-20 12:52:52 +01:00
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. 2015-05-19 16:49:20 +01:00
Kegan Dougal
9fd57c6fe6 Namespace all the things to v1. 2015-05-19 15:28:08 +01:00
Kegan Dougal
b4d245bce3 Add m.call.invite/candidates/answer/hangup 2015-05-18 17:54:17 +01:00
Kegan Dougal
6f842da227 Add redaction, feedback and presence events. 2015-05-18 17:28:38 +01:00
Kegan Dougal
c78088cfd1 Add m.room.aliases/create/join_rules/member/power_levels 2015-05-18 17:10:11 +01:00
Kegan Dougal
5216b1ac8a Add m.room.topic. Add title/descs. Add 'type' key checking. 2015-05-18 16:52:03 +01:00
Kegan Dougal
8ec10bbdf2 Add m.room.name and state_key core schema. 2015-05-18 16:21:09 +01:00
Kegan Dougal
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