Commit graph

114 commits

Author SHA1 Message Date
Richard van der Hoff d724b6bf75 Make null m.room.name behaviour explicit
PR feedback
2016-07-12 13:44:04 +01:00
Richard van der Hoff be9dccb266 m.room.canonical alias: fix schema syntax 2016-07-12 10:04:01 +01:00
Richard van der Hoff d4194dd24e Clarify the room-naming behaviour
Make behaviour on empty `m.room.name` and `m.room.canonical_alias` events
explicit.
2016-07-11 17:49:27 +01:00
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
Richard van der Hoff e594132e95 m.room.member: yaml tweak
Quote "string" for consistency with "null"
2016-06-22 17:32:01 +01:00
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
2016-06-22 12:01:08 +01:00
Richard van der Hoff 2eebacacfe Merge pull request #286 from matrix-org/dbkr/default_state_defaults
Update spec to say what the default state / events defaults are
2016-05-13 11:30:34 +02:00
Richard van der Hoff 33ec8dde88 m.room.power_levels: More newlines 2016-05-13 10:28:26 +01:00
Richard van der Hoff 8c3838bc04 Formatting tweaks for m.room.power_levels 2016-05-13 10:26:27 +01:00
Richard van der Hoff 2e9212af8a Fix typo in m.room.member schema
remove spurious SHOULD
2016-05-05 11:07:37 +01:00
Gergely Polonkai d94deb6296 Add event as a parent for all event types
Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>
2016-03-16 16:46:16 +01:00
Kegsay dd6dfa7635 Merge pull request #291 from gergelypolonkai/room-avatar-image-info
Update m.room.avatar schema so it references image_info in info
2016-03-14 15:31:57 +00:00
Daniel Wagner-Hall 77f495d36f Remove restrictions on StrippedState
Note also that these are purely informational and not things on which to
rely.

SPEC-357
2016-03-10 14:27:54 +00:00
Gergely Polonkai 6e2b02a608 Update m.room.avatar schema so it references image_info in info
Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>
2016-03-08 16:32:19 +01:00
Gergely Polonkai 583c8cbfaf Add invite key to m.room.power_levels schema
Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>
2016-03-08 15:50:27 +01:00
Gergely Polonkai 449bb09998 Fix for m.room.third_party_invite schema 2016-03-04 16:58:02 +01:00
David Baker 65e5a316bd Update spec to say what the default state / events defaults are, from inspecting the behaviour of synapse (which I'm not sure was intentional). 2016-03-02 18:31:14 +00:00
Daniel Wagner-Hall 11c572267e Add titles where they're missing 2016-03-02 15:23:48 +00:00
Daniel Wagner-Hall ea170e5dca m.third_party_invite: Allow multiple public keys 2016-02-12 13:15:21 +00:00
Daniel Wagner-Hall c959ca689c Explain what the room member states mean 2015-12-21 14:51:49 +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 f81b967e2d Make all the schema files yaml 2015-12-07 13:56:36 +00:00
Daniel Wagner-Hall 63ca91f353 Move event signing to server-server spec
It's *definitely* not a client concern.

It isn't really in the right place at the moment, but s-s is very much a
work in progress whereas c-s is nearly stable.
2015-12-04 10:55:18 +00: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
Paul Evans eb61f018c2 Merge pull request #144 from matrix-org/paul/small-fixes
Don't mark 'aliases' on m.room.canonical_alias as required
2015-11-27 15:42:36 +00:00
Mark Haines 5bae15d47b Merge branch 'master' into markjh/room_tags
Conflicts:
	api/client-server/v2_alpha/sync.yaml
2015-11-20 18:39:15 +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 4d3175fc8b Note that invite_room_state is optional 2015-11-12 10:45:57 +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 ebc0237109 Add the missing titles to the schema 2015-11-03 19:35:44 +00:00
Paul "LeoNerd" Evans 30a4f17420 Don't mark 'aliases' on m.room.canonical_alias as required, because it isn't. 2015-11-03 16:15:36 +00:00
Mark Haines fba3c04e42 Apparently the spec generator breaks if the title in a schema is too long 2015-11-03 15:48:30 +00:00
Mark Haines bcb8fac53c Add a description for the tag event 2015-11-03 15:46:01 +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
Mark Haines 12e33a3b09 Document a v2 api for setting tags on rooms 2015-10-26 16:14:24 +00:00
Daniel Wagner-Hall 67880686d5 Allow history to be noted as world-readable
SPEC-237
2015-10-23 14:02:53 +01: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 bbd3f8072c Review comments 2015-10-19 13:28:44 +01:00
Daniel Wagner-Hall f51e031066 Fix JSON 2015-10-19 12:36:10 +01:00
Kegan Dougal ae90d15b3c Add m.room.avatar 2015-10-19 10:46:07 +01:00
Daniel Wagner-Hall a38e0862cf Fix required field names 2015-10-16 18:56: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 83d21484df Oopsie 2015-10-16 16:54:40 +01:00
Kegan Dougal d39a9082a0 Add invite_room_state to spec. Flesh out info. 2015-10-16 16:43:33 +01:00
Kegsay 604e268add Merge pull request #105 from matrix-org/spec-177-events-max-len
Add in size limits as per SPEC-222
2015-10-15 11:08:28 +01:00