325 Commits (17e634d78a7d5347171033b429668727f46069de)

Author	SHA1	Message	Date
Travis Ralston	ee2ebe6792	Merge pull request #1568 from turt2live/travis/c2s/invite-room-state ... Move `invite_room_state` to the correct place in the client-server API	6 years ago
Travis Ralston	4e885c3f77	Merge pull request #1550 from turt2live/travis/general/acls ... Server ACLs	6 years ago
Matthew Hodgson	313e6de48b	tweak wording to spell out that handling legacy/noncompliant servers.	6 years ago
Travis Ralston	76afef79f8	Clarify the rationale and motive for blanket IP banning and port exclusion	6 years ago
Travis Ralston	82be6077ff	Add a note that ACLs don't operate at the auth level; Fix glob definition	6 years ago
Travis Ralston	be2e0fc9d4	Clarify that ACLs are required to manually deny unsupported hosts	6 years ago
Travis Ralston	72de8bec5c	Remove unused algorithms for encrypted messages	6 years ago
Travis Ralston	438f5825ae	Add more supported encryption algorithms to message events	6 years ago
Travis Ralston	17bdc0c740	Revert "Fix encrypted event examples" ... This reverts commit be9f6042e5.	6 years ago
Travis Ralston	55c0b968b5	Fix event schemas for /sync ... This commit clarifies the required keys for each type of event that appears in sync, fixes the core event schema not declaring 'content' as required, and includes a mention that events may not have a room_id when appearing in /sync. Fixes https://github.com/matrix-org/matrix-doc/issues/595 Fixes https://github.com/matrix-org/matrix-doc/issues/909	6 years ago
Travis Ralston	667fa082af	Replace applicable types of 'number' to 'integer' ... `number` implies/represents a float where `integer` does not. The only remaining `type: number` in the project appear on power levels: those have been left untouched pending clarification. Fixes https://github.com/matrix-org/matrix-doc/issues/746	6 years ago
Travis Ralston	e9e93b0eec	Move `invite_room_state` to the correct place in the client-server API ... Fixes https://github.com/matrix-org/matrix-doc/issues/1350	6 years ago
Travis Ralston	be9f6042e5	Fix encrypted event examples	6 years ago
Travis Ralston	e5a7dd1c45	Remove excess commas from JSON	6 years ago
Travis Ralston	aa294fac06	Define the supported HTML subset for message events ... Also clarify that `m.notice` messages can support HTML. Fixes https://github.com/matrix-org/matrix-doc/issues/1559 Fixes https://github.com/matrix-org/matrix-doc/issues/1560	6 years ago
Travis Ralston	295b1322e2	Add back the unsigned.age property to voip event examples	6 years ago
Valentin Deniaud	b7577ea237	document encrypted attachments ... Fix #461.	6 years ago
Valentin Deniaud	579f5ea928	fixup! document key sharing and m.room_key_request	6 years ago
Valentin Deniaud	8ae137e82e	fixup! document m.forwarded_room_key	6 years ago
Valentin Deniaud	768f33dc2d	fixup! document key sharing and m.room_key_request	6 years ago
Valentin Deniaud	337316445f	fixup! document m.forwarded_room_key	6 years ago
Travis Ralston	0f28f83270	Fix client-server event schemas: remove `age`, dedupe fields ... This commit adds support for event schema examples to have references to help reduce the chance of fields being forgotten. This also helps reduce duplication of fields, allowing for a more consistent spec that uses the same values everywhere. This also removes both `unsigned` and `age` from the examples as per: * https://github.com/matrix-org/matrix-doc/issues/1524 * https://github.com/matrix-org/matrix-doc/issues/630 Finally, this replaces "localhost" in the examples with an example domain. This is really just a nitpick thing on my part where seeing a "real world" domain is preferred. Fixes https://github.com/matrix-org/matrix-doc/issues/1524 Fixes https://github.com/matrix-org/matrix-doc/issues/630 Step towards https://github.com/matrix-org/matrix-doc/issues/1530	6 years ago
Travis Ralston	ef41b5c2bf	Server ACLs ... Implements the proposal for https://github.com/matrix-org/matrix-doc/issues/1383	6 years ago
Valentin Deniaud	019c290fa2	document m.forwarded_room_key	6 years ago
Valentin Deniaud	2d8a321b46	document key sharing and m.room_key_request	6 years ago
Travis Ralston	3869f68a5c	Merge remote-tracking branch 'matrix-org/master' into travis/general/room-versions	6 years ago
Valentin Deniaud	f853856f21	add missing m.room.encrypted event properties	6 years ago
Valentin Deniaud	6c44233c42	require megolm algorithm in m.room.encryption	6 years ago
Valentin Deniaud	661176cb3a	Olm m.room.encrypted example	6 years ago
Valentin Deniaud	8732378da2	add required room ids	6 years ago
Valentin Deniaud	c60109d235	complete m.room_key documentation	6 years ago
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	fde48e7ee8	Specify how room versioning works ... This is the spec PR for https://github.com/matrix-org/matrix-doc/issues/1425 Room version upgrades are not part of MSC1425. Documented aspects: * room_version on the create event * creating a room with a specific version (useful for testing) * make_join behaviour * error code documentation * grammar of room versions Based upon https://docs.google.com/document/d/1urKgReoHqxX8R_XtySB17dPi-DZcKhqTEL2_s895Wz0/edit	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	7 years ago
Michael Telatynski	c305317fa5	explicitly specify @room	7 years ago
Michael Telatynski	60ae73b179	specify default	7 years ago
Michael Telatynski	1e656d836e	spec notifications key on power level event and provide @room in example	7 years ago
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 (! -> $)	7 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.	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	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
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	9 years ago
Richard van der Hoff	33ec8dde88	m.room.power_levels: More newlines	9 years ago
Richard van der Hoff	8c3838bc04	Formatting tweaks for m.room.power_levels	9 years ago
Richard van der Hoff	df0e070146	Merge pull request #321 from matrix-org/rav/fix_eventschema_readme ... Update eventschema readme	9 years ago
Richard van der Hoff	2e9212af8a	Fix typo in m.room.member schema ... remove spurious SHOULD	9 years ago
Richard van der Hoff	4bc78633a5	We don't support z-schema or other JSON tools for now	9 years ago
Gergely Polonkai	d94deb6296	Add event as a parent for all event types ... Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>	9 years ago
Kegsay	dd6dfa7635	Merge pull request #291 from gergelypolonkai/room-avatar-image-info ... Update m.room.avatar schema so it references image_info in info	9 years ago
Daniel Wagner-Hall	77f495d36f	Remove restrictions on StrippedState ... Note also that these are purely informational and not things on which to rely. SPEC-357	9 years ago
Gergely Polonkai	6e2b02a608	Update m.room.avatar schema so it references image_info in info ... Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>	9 years ago
Gergely Polonkai	583c8cbfaf	Add invite key to m.room.power_levels schema ... Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>	9 years ago
Gergely Polonkai	449bb09998	Fix for m.room.third_party_invite schema	9 years ago
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).	9 years ago
Daniel Wagner-Hall	11c572267e	Add titles where they're missing	9 years ago
Daniel Wagner-Hall	ea170e5dca	m.third_party_invite: Allow multiple public keys	9 years ago
Daniel Wagner-Hall	c959ca689c	Explain what the room member states mean	9 years ago
Daniel Wagner-Hall	9bfe86f474	Add display_name to 3pid invites in m.room.member	9 years ago
Daniel Wagner-Hall	f81b967e2d	Make all the schema files yaml	9 years ago
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.	9 years ago
Daniel Wagner-Hall	aa4ed10821	Unify v1 and v2 event schemas	9 years ago
Daniel Wagner-Hall	79244e8065	Remove redundant node event schema checker ... The python one does the same	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
Paul Evans	eb61f018c2	Merge pull request #144 from matrix-org/paul/small-fixes ... Don't mark 'aliases' on m.room.canonical_alias as required	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
Daniel Wagner-Hall	4faede73a1	Merge branch 'master' into daniel/multipleexamples	9 years ago
Mark Haines	5bae15d47b	Merge branch 'master' into markjh/room_tags ... Conflicts: api/client-server/v2_alpha/sync.yaml	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	4d3175fc8b	Note that invite_room_state is optional	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	2734f9f9f2	Merge branch 'master' into daniel/multipleexamples ... Conflicts: specification/modules/third_party_invites.rst	9 years ago
Daniel Wagner-Hall	161441fa3a	Update 3pid spec based on new implementation	9 years ago
Mark Haines	ebc0237109	Add the missing titles to the schema	9 years ago
Paul "LeoNerd" Evans	30a4f17420	Don't mark 'aliases' on m.room.canonical_alias as required, because it isn't.	9 years ago
Mark Haines	d53814097f	Add example content to the tags in example tag events	9 years ago
Mark Haines	fba3c04e42	Apparently the spec generator breaks if the title in a schema is too long	9 years ago
Mark Haines	bcb8fac53c	Add a description for the tag event	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	810922bb38	Fix schema validator for multiple examples	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
Daniel Wagner-Hall	67880686d5	Allow history to be noted as world-readable ... SPEC-237	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	bbd3f8072c	Review comments	9 years ago
Daniel Wagner-Hall	b7355b0fa5	Merge pull request #117 from matrix-org/daniel/jenkins ... Give useful error if z-schema is missing	9 years ago
Daniel Wagner-Hall	b2aae762fc	Give useful error if z-schema is missing	9 years ago
Daniel Wagner-Hall	f51e031066	Fix JSON	9 years ago
Kegan Dougal	ae90d15b3c	Add m.room.avatar	9 years ago
Daniel Wagner-Hall	a38e0862cf	Fix required field names	9 years ago
Daniel Wagner-Hall	6161a920b6	Update 3pid invite section to reflect signed property	9 years ago
Kegan Dougal	83d21484df	Oopsie	9 years ago
Kegan Dougal	a8d8412068	Add invite_room_state example.	9 years ago
Kegan Dougal	d39a9082a0	Add invite_room_state to spec. Flesh out info.	9 years ago
Kegsay	604e268add	Merge pull request #105 from matrix-org/spec-177-events-max-len ... Add in size limits as per SPEC-222	9 years ago
Kegsay	c5dc383668	Merge pull request #85 from matrix-org/module-im ... Instant messaging module	9 years ago
Kegan Dougal	6a0595bc46	Add in size limits as per SPEC-222	9 years ago