99 Commits (f1ebbc358bd873988b2e987e32c53105a0e55293)

Author	SHA1	Message	Date
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
Michael Telatynski	57571ea4ce	Merge branch 'master' of github.com:matrix-org/matrix-doc into notifications/room	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	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	af74790681	Merge remote-tracking branch 'matrix-org/master' into travis/m.ignored_user_list	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
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
Mark Haines	05001bcaa6	Fix whitepace	8 years ago
Mark Haines	29e33deeb5	Fix m.location example	8 years ago
David Baker	85bc989c02	pr feedback	8 years ago