Commit graph

3990 commits

Author SHA1 Message Date
Travis Ralston
b9c9396c11 Specify some of the common concepts for Matrix in the index
See https://github.com/matrix-org/matrix-doc/pull/2061
Fixes https://github.com/matrix-org/matrix-doc/issues/1468
Fixes https://github.com/matrix-org/matrix-doc/issues/1528

The section is not referenced by the specifications yet - they do a fairly good job of explaining it over and over. In future, it would be good to point all the references to the index.
2019-06-06 15:59:54 -06:00
Travis Ralston
e1266b859f
Merge pull request #2030 from matrix-org/travis/1.0/bind-msisdn
Spec MSISDN UIA support
2019-06-06 10:24:34 -06:00
Travis Ralston
eb06e131df
Merge pull request #2090 from matrix-org/travis/1.0/more-auth
Clarify when authorization and rate-limiting are not applicable
2019-06-06 09:01:42 -06:00
Travis Ralston
79bbb47d9f Clarify when authorization and rate-limiting are not applicable
Fixes https://github.com/matrix-org/matrix-doc/issues/1971
2019-06-05 23:18:04 -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
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
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
dda7afa845
Merge pull request #1717 from uhoreg/e2e_verification
MSC1717: common definitions for key verification methods
2019-06-02 10:45:39 -06:00
Travis Ralston
57e3b152b0 Move section to under Olm stuff 2019-05-31 11:37:09 -06:00
Travis Ralston
754b19bb92
typo
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2019-05-31 10:21:16 -06:00
Travis Ralston
ad07d8e6ff
Merge pull request #2051 from matrix-org/travis/1.0/fix-examples
Use consistent event examples throughout the Client-Server API
2019-05-31 08:42:34 -06:00
Travis Ralston
d7f37f92eb Merge branch 'master' into travis/1.0/fix-examples 2019-05-30 16:57:51 -06:00
Travis Ralston
ff768ec75f
Merge pull request #2036 from matrix-org/travis/1.0/wk-fail-error
Clarify that FAIL_ERROR is not limited to just homeservers.
2019-05-30 16:56:28 -06:00
Travis Ralston
41e07ff7d6 Fix incorrect state of leave->leave
As mentioned in PR review, it is possible for moderators in a room to race at kicking someone, resulting in multiple leave events.
2019-05-30 16:54:19 -06:00
Travis Ralston
d48265f49b typo 2019-05-30 16:51:24 -06:00
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
2019-05-30 16:47:30 -06:00
Travis Ralston
9d7289f4f2
Merge pull request #2049 from matrix-org/travis/1.0/store-invite-params
Add missing aesthetic parameters to /store-invite
2019-05-30 16:18:22 -06:00
Travis Ralston
a2f955b50d
Merge pull request #2053 from matrix-org/travis/1.0/required-urls
Make url required for m.file-like messages
2019-05-30 14:17:50 -06:00
Travis Ralston
ff33b470a4
Merge pull request #2039 from matrix-org/travis/1.0/more-changelogs
Fix more changelog entries
2019-05-30 14:14:34 -06:00
Andrew Morgan
dda8976d25 Add changelog 2019-05-30 12:33:29 +01:00
Andrew Morgan
c0c4629993
Slight word change 2019-05-30 12:31:26 +01:00
Andrew Morgan
6ae7e49522
Clarify what the client should receiving on email resending
It was a little unclear what the client should do when asked to send a validation email and provides a `send_attempt` value that is not greater than previous attempts. As this is intended to be for when a client mistakenly sends the request twice, it makes logical sense that the implication was to simply resend a success value so the client doesn't error even when an email may have been sent on the first attempt.

This behaviour was also mimicked in Synapse/Sydent.
2019-05-30 12:30:43 +01:00
Travis Ralston
f3c0c5232f Add a table to show how changes in membership should be interpreted
Fixes https://github.com/matrix-org/matrix-doc/issues/876
2019-05-29 21:47:07 -06:00
Travis Ralston
41a036a453
Merge pull request #2050 from matrix-org/travis/1.0/clarify-proposals
Synchronize proposals_intro.rst and CONTRIBUTING.rst
2019-05-29 18:26:53 -06:00
Travis Ralston
464845feb0 Make url required for m.file-like messages
Fixes https://github.com/matrix-org/matrix-doc/issues/2008

This also removes `filename` from `m.file` because it has never been used in practice.
2019-05-29 16:36:43 -06:00
Travis Ralston
792bb8faa4 Renumber changelog to match PR 2019-05-29 16:28:36 -06:00
Travis Ralston
f9472bae41 Change reference for definition of push rule condition kinds
Fixes https://github.com/matrix-org/matrix-doc/issues/1970
2019-05-29 16:27:52 -06:00
Travis Ralston
d2232aca97
Merge pull request #2042 from matrix-org/travis/1.0/ordered-flows
Clarify that login flows must be completed in order
2019-05-29 16:26:22 -06:00
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.
2019-05-29 15:28:48 -06:00
Travis Ralston
c25afa663e Use consistent event examples throughout the Client-Server API
Fixes https://github.com/matrix-org/matrix-doc/issues/1968
2019-05-29 14:57:56 -06:00
Travis Ralston
78d93432f4 Synchronize proposals_intro.rst and CONTRIBUTING.rst 2019-05-29 14:00:34 -06:00
Travis Ralston
15b8011f63 Add missing aesthetic parameters to /store-invite
Fixes https://github.com/matrix-org/matrix-doc/issues/2048
2019-05-29 13:37:58 -06:00
Hubert Chathi
6929579360 add some clarifications 2019-05-29 15:18:54 -04:00
Hubert Chathi
ffb70a2fab
fix typo
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-05-29 15:01:35 -04:00
Travis Ralston
4452ebf371
Merge pull request #2041 from matrix-org/travis/1.0/upload-mime-example
Fix example Content-Type for /media/upload request
2019-05-29 08:24:19 -06:00
Hubert Chathi
84f0d9d7e4 add clarification 2019-05-28 20:07:45 -04:00
Travis Ralston
76829ad988
Merge pull request #2037 from matrix-org/travis/1.0/appservice-hs-token
Clarify how homeservers are meant to auth themselves to appservices
2019-05-28 12:56:28 -06:00
Travis Ralston
e2da3728a0 Only error if the token doesn't match 2019-05-28 12:53:48 -06:00
Travis Ralston
a8f61697d1
Merge pull request #2032 from matrix-org/travis/1.0/redaction-effects
Clarify how redactions affect room state
2019-05-28 12:52:42 -06:00