a24bcc2c0a
Merge pull request #2258 from matrix-org/travis/spec/is-terms
...
Spec IS terms of service
2019-09-06 10:29:47 -06:00
958cffd330
Spec m.identity_server account data
...
As per [MSC2230](https://github.com/matrix-org/matrix-doc/pull/2230 )
2019-09-04 16:17:41 -06:00
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.
2019-09-03 14:04:05 -06:00
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.
2019-08-26 12:21:23 +02:00
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
2019-07-03 10:59:38 +01:00
370ae8b9fe
Merge pull request #2068 from matrix-org/travis/1.0/mxc
...
Refactor documentation for content/media repository
2019-06-11 08:32:06 -06:00
4b6e2cc956
Merge pull request #2072 from matrix-org/travis/1.0/msc1717-msc1267-sas-verification
...
Spec SAS verification and the common key verification framework
2019-06-07 10:34:08 -06:00
70da564e2b
Merge pull request #2067 from matrix-org/travis/1.0/stripped-state
...
Clarify exactly what StrippedState is
2019-06-07 07:12:17 -06:00
a3364ff357
Spec SAS verification and the common key verification framework
...
Reference implementations:
* 94f664e725https://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.
2019-06-04 12:43:47 -06:00
9cb60fa468
Merge pull request #2059 from matrix-org/travis/1.0/msc1719-olm-unwedge
...
Add Olm unwedging
2019-06-04 11:14:54 -06:00
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
2019-06-02 21:25:11 -06:00
0b45f3795b
Rename example to invite_room_state
...
This is a better representation of what it actually is
2019-06-02 18:02:22 -06:00
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.
2019-06-02 17:41:39 -06:00
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
2019-05-30 16:47:30 -06:00
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.
2019-05-29 15:28:48 -06:00
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.
2019-05-26 20:52:59 -06:00
d4b4d92b82
Fix the m.push_rules type (switch from the state event to the common event).
2019-02-16 00:24:26 +03:00
2de7ef9a3d
#1865 Add the m.push_rules schema.
2019-02-15 23:23:38 +03:00
b85f7bb248
Add room version upgrades
...
Implements https://github.com/matrix-org/matrix-doc/issues/1501
2019-01-09 17:02:09 -07:00
f78bb72be8
Add status_msg to m.presence example
2018-12-10 15:41:41 -07:00
192a6c2ab9
Use example.org on examples instead of domain.com which is a real domain
...
Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com>
2018-09-02 17:58:21 +03:00
679ddabb53
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/read-markers
2018-08-31 10:34:19 -06:00
afa16f1e4e
Merge pull request #1606 from turt2live/travis/c2s/room-tags
...
Update the room tagging documentation
2018-08-31 08:36:40 -06:00
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)d69decd5c7/synapse/rest/client/v2_alpha/read_marker.py (L45-L52)
2018-08-30 16:21:31 -06:00
429f302744
Add an `age` to the invite room state example
2018-08-30 13:32:53 -06:00
6aacec3178
Fix power level JSON example
2018-08-30 11:40:08 -06:00
827033c128
Merge remote matrix-org/master
2018-08-30 11:29:47 -06:00
fd7cb22a28
Fix event type example of m.forwarded_room_key
2018-08-29 21:22:47 -06:00
4230e375fa
Merge pull request #1465 from Zil0/key_sharing
...
Document key sharing events
2018-08-29 23:05:17 -04:00
c03f2f8d79
Minor touchups to the room tagging API
...
Fixes some of https://github.com/matrix-org/matrix-doc/issues/1565
2018-08-29 14:53:55 -06:00
26d5a24b88
Merge remote matrix-org/master
2018-08-29 14:17:21 -06:00
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
2018-08-29 09:32:14 -06:00
8e42f3ab3a
Fix bad merge on brackets
2018-08-27 19:26:08 -06:00
4b05194a91
Fix bad merge
2018-08-27 19:18:14 -06:00
4278a9a516
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/fix-events
2018-08-27 19:17:37 -06:00
e4f8c23972
Merge pull request #1562 from turt2live/travis/c2s/html-formatting
...
Define the supported HTML subset for message events
2018-08-27 19:14:52 -06:00
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
2018-08-27 18:47:24 -06:00
e9e93b0eec
Move `invite_room_state` to the correct place in the client-server API
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1350
2018-08-26 20:51:39 -06:00
e5a7dd1c45
Remove excess commas from JSON
2018-08-25 23:00:26 -06:00
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
2018-08-25 22:57:52 -06:00
295b1322e2
Add back the unsigned.age property to voip event examples
2018-08-25 22:26:23 -06:00
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
2018-08-24 18:04:51 -06:00
ef41b5c2bf
Server ACLs
...
Implements the proposal for https://github.com/matrix-org/matrix-doc/issues/1383
2018-08-22 12:48:37 -06:00
019c290fa2
document m.forwarded_room_key
2018-08-21 21:35:03 +02:00
2d8a321b46
document key sharing and m.room_key_request
2018-08-21 21:35:03 +02:00
661176cb3a
Olm m.room.encrypted example
2018-08-18 11:41:45 +02:00
8732378da2
add required room ids
2018-08-18 11:41:45 +02:00
c60109d235
complete m.room_key documentation
2018-08-18 11:41:45 +02:00
3a8d13df60
add missing m.room.encryption properties
2018-08-18 11:41:45 +02:00
e5005b2d0f
document E2E events
...
This was written by Richard van der Hoff.
2018-08-18 11:41:45 +02:00
Travis Ralston