Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-27 03:18:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4009 commits 30 branches 42 tags 32 MiB
Commit graph

4009 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston 4c82553df4
Merge pull request #2047 from matrix-org/travis/1.0/test-vectors 
Fix test vectors with invalid JSON and signature
 2019-06-07 08:54:35 -06:00
Travis Ralston 00fee74636 Update example 2019-06-07 07:40:52 -06:00
Travis Ralston f4e85853d4
Merge pull request #2054 from matrix-org/travis/1.0/uia-clarifications 
Clarify that UIA stages cannot be attempted twice
 2019-06-07 07:38:40 -06:00
Travis Ralston 9cf03325b9
Merge pull request #2046 from matrix-org/travis/1.0/msc1915-unbind 
Spec 3PID unbind API
 2019-06-07 07:33:33 -06:00
Travis Ralston 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
Richard van der Hoff e4de464476
Merge pull request #2100 from JJJollyjim/master 
Fix 404s in links from room v1 spec
 2019-06-07 10:24:30 +01:00
Jamie McClymont d7858354f2 Fix 404s in links from room v1 spec 2019-06-07 20:54:47 +12:00
Travis Ralston 7f01346bba Provide a more complete example of a "minimally-sized event" 
Using all the required fields of a v1 event.
 2019-06-06 23:50:26 -06:00
Travis Ralston ae9abe798e Revert signature change for redactable event test 
The previous signature was calculated on the unredacted event, which means the signature produced was wrong.
 2019-06-06 23:41:51 -06:00
Travis Ralston d9170b4b3a
Merge pull request #2095 from matrix-org/travis/1.0/txn-obj-s2s 
Clarify how many PDUs are in a given transaction object
 2019-06-06 16:55:39 -06:00
Travis Ralston 9bf0103ef3 Clarify how many PDUs are in a given transaction object 
Fixes https://github.com/matrix-org/matrix-doc/issues/2093
 2019-06-06 14:36:30 -06:00
Travis Ralston e644227f4b Clarify that the server shouldn't process retries for UIA 2019-06-06 14:13:20 -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 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
Travis Ralston b9c4a2561f Fix examples of StrippedState in s2s spec 2019-06-02 17:50:27 -06:00
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.
 2019-06-02 17:41:39 -06: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