119 Commits (a1a40c63465d5147a7dfbdd8bb781fee3e66df05)

Author	SHA1	Message	Date
Travis Ralston	a24bcc2c0a	Merge pull request #2258 from matrix-org/travis/spec/is-terms ... Spec IS terms of service	5 years ago
Travis Ralston	958cffd330	Spec m.identity_server account data ... As per [MSC2230](https://github.com/matrix-org/matrix-doc/pull/2230)	5 years ago
Travis Ralston	afd5018494	Spec the terms of service handling for identity servers ... Part of MSC2140 Convert status codes to strings if there is a string status code. Fixes a build error when we mix 4xx and 403 in the same definition. We also have to correct stringified numbers to pass the build.	5 years ago
Damir Jelić	a96a2f3fce	Fix the action of a room key request cancellation. ... The spec states that the action of a room key request cancellation should be "cancel_request" but every known implementation uses "request_cancellation" instead. This patch fixes the spec to reflect the implementations.	5 years ago
J. Ryan Stinnett	4c65660b96	Clarify `.m.rule.room_one_to_one` push rule ... This clarifies the `.m.rule.room_one_to_one` push rule by adding a condition on event type. Some parts of the spec already had this info, while others were missing it. Synapse has had this behaviour since the push rule appeared. Fixes https://github.com/matrix-org/matrix-doc/issues/2150	5 years ago
Travis Ralston	370ae8b9fe	Merge pull request #2068 from matrix-org/travis/1.0/mxc ... Refactor documentation for content/media repository	6 years ago
Travis Ralston	4b6e2cc956	Merge pull request #2072 from matrix-org/travis/1.0/msc1717-msc1267-sas-verification ... Spec SAS verification and the common key verification framework	6 years ago
Travis Ralston	70da564e2b	Merge pull request #2067 from matrix-org/travis/1.0/stripped-state ... Clarify exactly what StrippedState is	6 years ago
Travis Ralston	a3364ff357	Spec SAS verification and the common key verification framework ... Reference implementations: * 94f664e725 * https://github.com/matrix-org/matrix-react-sdk/pull/2461 * https://github.com/matrix-org/matrix-js-sdk/pull/818 * https://github.com/matrix-org/matrix-react-sdk/pull/2596 * https://github.com/matrix-org/matrix-js-sdk/pull/837 Proposals: * [MSC1717](https://github.com/matrix-org/matrix-doc/pull/1717) * [MSC1267](https://github.com/matrix-org/matrix-doc/issues/1267) No alterations to either proposal have been made intentionally here.	6 years ago
Travis Ralston	9cb60fa468	Merge pull request #2059 from matrix-org/travis/1.0/msc1719-olm-unwedge ... Add Olm unwedging	6 years ago
Travis Ralston	1f86e8e31b	Refactor documentation for content/media repository ... Fixes https://github.com/matrix-org/matrix-doc/issues/2060 Fixes https://github.com/matrix-org/matrix-doc/issues/772 Fixes https://github.com/matrix-org/matrix-doc/issues/888	6 years ago
Travis Ralston	0b45f3795b	Rename example to invite_room_state ... This is a better representation of what it actually is	6 years ago
Travis Ralston	7a07a6b358	Clarify exactly what StrippedState is ... Fixes https://github.com/matrix-org/matrix-doc/issues/2066 The expectation everywhere is that the `sender` is required. `/initialSync` references StrippedState through a `m.room.member` event reference, and does not need editing.	6 years ago
Travis Ralston	54f74cd877	Add Olm unwedging ... As per [MSC1719](https://github.com/matrix-org/matrix-doc/pull/1719) No known alterations have been made to the proposal. Implementation proof: https://github.com/matrix-org/matrix-js-sdk/pull/780	6 years ago
Travis Ralston	d6d74c4cbe	Switch to using $ instead of # for sub-types ... # is reserved by the swagger validator as a way to include partial content from a JSON object (eg: "#/path" would include {"test": true} from the object {"path":{"test":true}}). Instead of trying to convince the validator that it is wrong, we'll just use a different character. Note that our rendering tools do not care about #-style references to objects. It's still somewhat worth changing the character though.	6 years ago
Travis Ralston	5eea4a477f	Add server notices support ... As per [MSC1452](https://github.com/matrix-org/matrix-doc/issues/1452) Fixes https://github.com/matrix-org/matrix-doc/issues/1254 Although MSC1452 focuses on just the warnings part of the server notices, the base for notices has not been established in the spec. This commit adds the needed support to be able to handle notices. No intentional divergences from the proposal are included in this changeset. There are a few additions which are used in practice although not defined in the proposal, such as who is responsible for aesthetics, sending notices, and other misc rules.	6 years ago
Anatoly Sablin	d4b4d92b82	Fix the m.push_rules type (switch from the state event to the common event).	6 years ago
Anatoly Sablin	2de7ef9a3d	#1865 Add the m.push_rules schema.	6 years ago
Travis Ralston	b85f7bb248	Add room version upgrades ... Implements https://github.com/matrix-org/matrix-doc/issues/1501	6 years ago
Travis Ralston	f78bb72be8	Add status_msg to m.presence example	6 years ago
Konstantinos Sideris	192a6c2ab9	Use example.org on examples instead of domain.com which is a real domain ... Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com>	6 years ago
Travis Ralston	679ddabb53	Merge remote-tracking branch 'matrix-org/master' into travis/c2s/read-markers	6 years ago
Travis Ralston	afa16f1e4e	Merge pull request #1606 from turt2live/travis/c2s/room-tags ... Update the room tagging documentation	6 years ago
Travis Ralston	f923d08078	Add read markers ... This is the spec for https://github.com/matrix-org/matrix-doc/issues/910 Fixes https://github.com/matrix-org/matrix-doc/issues/910 Some reverse engineering was required to work out the complete details as to how this works. In particular, the 405 for setting account data and the behaviour of m.read. References: * 405 for account data: d69decd5c7/synapse/rest/client/v2_alpha/account_data.py (L85-L90) * m.read behaviour: d69decd5c7/synapse/rest/client/v2_alpha/read_marker.py (L45-L52)	6 years ago
Travis Ralston	429f302744	Add an `age` to the invite room state example	6 years ago
Travis Ralston	6aacec3178	Fix power level JSON example	6 years ago
Travis Ralston	827033c128	Merge remote matrix-org/master	6 years ago
Travis Ralston	fd7cb22a28	Fix event type example of m.forwarded_room_key	6 years ago
Hubert Chathi	4230e375fa	Merge pull request #1465 from Zil0/key_sharing ... Document key sharing events	6 years ago
Travis Ralston	c03f2f8d79	Minor touchups to the room tagging API ... Fixes some of https://github.com/matrix-org/matrix-doc/issues/1565	6 years ago
Travis Ralston	26d5a24b88	Merge remote matrix-org/master	6 years ago
Travis Ralston	62b1b8b660	Have unsigned.age appear on all room events ... This is useful for a lot of things, like bridges (appservices), VoIP handling, and clients which generally may wish to do something with the field. Might as well include it on every event, despite the recommendation of https://github.com/matrix-org/matrix-doc/issues/1524	6 years ago
Travis Ralston	8e42f3ab3a	Fix bad merge on brackets	6 years ago
Travis Ralston	4b05194a91	Fix bad merge	6 years ago
Travis Ralston	4278a9a516	Merge remote-tracking branch 'matrix-org/master' into travis/c2s/fix-events	6 years ago
Travis Ralston	e4f8c23972	Merge pull request #1562 from turt2live/travis/c2s/html-formatting ... Define the supported HTML subset for message events	6 years ago
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	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	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
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
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