Commit graph

5313 commits

Author SHA1 Message Date
Travis Ralston c8a3850598 Merge GET/PUT /state/:event_type endpoints
Clarifying that the state key is optional, and how that works.

Fixes https://github.com/matrix-org/matrix-doc/issues/1182
2019-06-05 23:06:00 -06:00
Travis Ralston 8fd5b15594 Reorganize event structure in c2s spec and clarify event capabilities
Fixes https://github.com/matrix-org/matrix-doc/issues/1166
Fixes https://github.com/matrix-org/matrix-doc/issues/1527
Fixes https://github.com/matrix-org/matrix-doc/issues/1827

Note: In order to fix the "state events have the following fields: [no words]" bug (1827) we need to resolve references on common event types. When doing this we ultimately end up with more fields than may be required to explain the section, however this commit alters the section descriptions to just say "these fields" instead of "these additional fields".

This is also preferable over trying to get the inheritance reversed in the common event types, as the `/sync` endpoint has a high amount of reliance on partial events definitions.
2019-06-05 22:55:11 -06:00
Travis Ralston 500f3d3bf1 Clarify that the default s2s transport is JSON over HTTP
Fixes https://github.com/matrix-org/matrix-doc/issues/1713
2019-06-05 22:28:57 -06:00
Travis Ralston e115e3439d Touchups on the s2s swagger definitions
Duplicate properties, wrong types, etc.
2019-06-05 22:13:25 -06:00
Travis Ralston a19eb59f13 Clarify the key object definition for the key management API
Fixes https://github.com/matrix-org/matrix-doc/issues/1907


One too far
2019-06-05 22:09:42 -06:00
Travis Ralston 80aa5a24dc Make v4 the "default" room version
As per [MSC2002](https://github.com/matrix-org/matrix-doc/pull/2002). This was missed in https://github.com/matrix-org/matrix-doc/pull/2019

Fixes https://github.com/matrix-org/matrix-doc/issues/2071
2019-06-05 20:33:09 -06:00
Travis Ralston 7ce1ff2135 Clarify which servers are supposed to sign events
Fixes https://github.com/matrix-org/matrix-doc/issues/2074
2019-06-05 20:30:21 -06:00
Travis Ralston a6314df44c Spec v5 rooms: Key validity
Proposals:
* [MSC2076](https://github.com/matrix-org/matrix-doc/pull/2076)
* [MSC2077](https://github.com/matrix-org/matrix-doc/pull/2077)

Implementation references:
* 00bf99fa62
* https://github.com/matrix-org/synapse/pull/5354
* https://github.com/matrix-org/synapse/pull/5321

No known differences from the proposals are included here - alterations are accidental.
2019-06-05 17:03:19 -06:00
Andrew Morgan 3e23dde341 Be clear that any 3PID token request can now be done by the hs 2019-06-05 21:49:02 +01:00
Andrew Morgan 9000247008 Merge branch 'anoa/msc2078' of github.com:matrix-org/matrix-doc into anoa/msc2078
* 'anoa/msc2078' of github.com:matrix-org/matrix-doc:
  Update proposals/2078-homeserver-password-resets.md
2019-06-05 17:54:27 +01:00
Andrew Morgan d3f21e0360 Address review comments 2019-06-05 17:54:18 +01:00
Travis Ralston fc4965f274 Stronger spec words 2019-06-05 10:40:51 -06:00
Travis Ralston 9ac89cc915
Merge pull request #2056 from matrix-org/travis/1.0/membership-table
Add a table to show how changes in membership should be interpreted
2019-06-05 10:38:32 -06:00
Travis Ralston de725c26cc Add more clarity to the media repo 2019-06-05 10:37:22 -06:00
Andrew Morgan e49518099d Be explicit with request/responses 2019-06-05 17:37:09 +01:00
Andrew Morgan 395acf8e06
Update proposals/2078-homeserver-password-resets.md
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2019-06-05 15:58:14 +01:00
Andrew Morgan 6bb48723e8 The HS can send any URL 2019-06-05 15:43:57 +01:00
Andrew Morgan 6e0af5e64c If no submit_url, just send it to the IS as before 2019-06-05 15:07:06 +01:00
Andrew Morgan 4174b61279 submit_url only if the user has to enter the code somewhere 2019-06-05 14:50:40 +01:00
Andrew Morgan 8259ae292a Capitalise SMS 2019-06-05 14:39:36 +01:00
Andrew Morgan 7e18c5d5a8 Add new submit_url response field 2019-06-05 14:38:16 +01:00
Travis Ralston aa110b2be2
Merge pull request #2025 from matrix-org/travis/1.0/3rdpartysigned
Fix third party signed definitions for join APIs
2019-06-05 07:10:19 -06:00
Travis Ralston e8d6a57a2e
Merge pull request #2052 from matrix-org/travis/1.0/pushrules-kind
Change reference for definition of push rule condition kinds
2019-06-05 07:08:32 -06:00
Andrew Morgan 8cba7adcdf Clarify conditions for attack 2019-06-05 13:52:02 +01:00
Andrew Morgan 085c5667a4 wrap lines 2019-06-05 13:42:23 +01:00
Andrew Morgan 1956f1a916 Revert "Remove attacker bit"
This reverts commit c9711acbc5.
2019-06-05 12:59:58 +01:00
Andrew Morgan c9711acbc5 Remove attacker bit 2019-06-05 12:52:01 +01:00
Andrew Morgan 4e692735f5 Update some wording 2019-06-05 11:25:26 +01:00
Andrew Morgan cf932ad4f8 msc2078 - proposal for homeservers sending passwords reset requests 2019-06-05 11:20:28 +01:00
Richard van der Hoff 40b10f254b clarifications 2019-06-05 07:18:25 +01:00
Richard van der Hoff 3347a480eb fix typo 2019-06-05 00:07:05 +01:00
Richard van der Hoff d2ccd6b268 MSC2077: room v5 2019-06-04 23:53:42 +01:00
Richard van der Hoff 37b1e171fc MSC2076: Enforce key-validity periods when validating event signatures 2019-06-04 23:51:10 +01:00
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.
2019-06-04 12:43:47 -06:00
Travis Ralston 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
Travis Ralston b92b147797
Merge pull request #1719 from uhoreg/olm_unwedging
MSC1719: olm session unwedging
2019-06-04 11:14:15 -06:00
Travis Ralston 9dd171a718
Merge pull request #2069 from matrix-org/bwindels/messages-chunk-order
Clarify the order events in chunk are returned in for /messages
2019-06-04 10:59:45 -06:00
Travis Ralston 042455d954
Update changelog to appease style guidelines 2019-06-04 10:58:39 -06:00
Bruno Windels 8b28972a2d PR feedback 2019-06-04 09:29:12 +02:00
Travis Ralston 39144942da
Fix title ordering 2019-06-03 20:39:41 -06:00
Travis Ralston 010757c01d
Merge pull request #2057 from matrix-org/anoa/clarify_email_sending
Clarify what the client should receiving on email resending
2019-06-03 11:05:28 -06:00
Andrew Morgan 13e7dbd53a Merge branch 'anoa/clarify_email_sending' of github.com:matrix-org/matrix-doc into anoa/clarify_email_sending 2019-06-03 09:48:59 +01:00
Andrew Morgan 49b9bfc9f6 Move changelog to the right place 2019-06-03 09:48:53 +01:00
Andrew Morgan 0b42a17352
Update api/identity/definitions/request_email_validation.yaml
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-06-03 09:48:38 +01:00
Bruno Windels 53aa8fe8ec clarify the order events in chunk for /messages 2019-06-03 09:47:09 +02:00
Travis Ralston dc6d89caca Split download endpoints back apart
Apparently you can't have an optional path parameter.
2019-06-02 21:31:06 -06:00
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
2019-06-02 21:25:11 -06:00
Travis Ralston 86019c9ade Skip over partial event definitions in examples 2019-06-02 18:02:36 -06:00
Travis Ralston 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
Travis Ralston 237d585e07 Shorten references to StrippedState in s2s spec 2019-06-02 17:59:19 -06:00