Commit Graph

4011 Commits (62910a28cccf0f6df53c1888b7044b873ec35cad)
 

Author SHA1 Message Date
Andrew Morgan 62910a28cc Merge branch 'master' into anoa/hs_3pid_tokens
* master:
  Update example
  Fix 404s in links from room v1 spec
  Provide a more complete example of a "minimally-sized event"
  Revert signature change for redactable event test
  Clarify how many PDUs are in a given transaction object
  Clarify that the server shouldn't process retries for UIA
  Clarify when authorization and rate-limiting are not applicable
  Skip over partial event definitions in examples
  Rename example to invite_room_state
  Shorten references to StrippedState in s2s spec
  Fix examples of StrippedState in s2s spec
  Clarify exactly what StrippedState is
  Clarify that UIA stages cannot be attempted twice
  Fix test vectors with invalid JSON and signature
  Spec 3PID unbind API
  Spec MSISDN UIA support
5 years ago
Andrew Morgan 3148184052 HS' can send 3PID token. Add a new submit_url field 5 years ago
Travis Ralston 4c82553df4
Merge pull request #2047 from matrix-org/travis/1.0/test-vectors
Fix test vectors with invalid JSON and signature
5 years ago
Travis Ralston 00fee74636 Update example 5 years ago
Travis Ralston f4e85853d4
Merge pull request #2054 from matrix-org/travis/1.0/uia-clarifications
Clarify that UIA stages cannot be attempted twice
5 years ago
Travis Ralston 9cf03325b9
Merge pull request #2046 from matrix-org/travis/1.0/msc1915-unbind
Spec 3PID unbind API
5 years ago
Travis Ralston 70da564e2b
Merge pull request #2067 from matrix-org/travis/1.0/stripped-state
Clarify exactly what StrippedState is
5 years ago
Richard van der Hoff e4de464476
Merge pull request #2100 from JJJollyjim/master
Fix 404s in links from room v1 spec
5 years ago
Jamie McClymont d7858354f2 Fix 404s in links from room v1 spec 5 years ago
Travis Ralston 7f01346bba Provide a more complete example of a "minimally-sized event"
Using all the required fields of a v1 event.
5 years ago
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.
5 years ago
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
5 years ago
Travis Ralston 9bf0103ef3 Clarify how many PDUs are in a given transaction object
Fixes https://github.com/matrix-org/matrix-doc/issues/2093
5 years ago
Travis Ralston e644227f4b Clarify that the server shouldn't process retries for UIA 5 years ago
Travis Ralston e1266b859f
Merge pull request #2030 from matrix-org/travis/1.0/bind-msisdn
Spec MSISDN UIA support
5 years ago
Travis Ralston eb06e131df
Merge pull request #2090 from matrix-org/travis/1.0/more-auth
Clarify when authorization and rate-limiting are not applicable
5 years ago
Travis Ralston 79bbb47d9f Clarify when authorization and rate-limiting are not applicable
Fixes https://github.com/matrix-org/matrix-doc/issues/1971
5 years ago
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
5 years ago
Travis Ralston aa110b2be2
Merge pull request #2025 from matrix-org/travis/1.0/3rdpartysigned
Fix third party signed definitions for join APIs
5 years ago
Travis Ralston e8d6a57a2e
Merge pull request #2052 from matrix-org/travis/1.0/pushrules-kind
Change reference for definition of push rule condition kinds
5 years ago
Travis Ralston 9cb60fa468
Merge pull request #2059 from matrix-org/travis/1.0/msc1719-olm-unwedge
Add Olm unwedging
5 years ago
Travis Ralston b92b147797
Merge pull request #1719 from uhoreg/olm_unwedging
MSC1719: olm session unwedging
5 years ago
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
5 years ago
Travis Ralston 042455d954
Update changelog to appease style guidelines 5 years ago
Bruno Windels 8b28972a2d PR feedback 5 years ago
Travis Ralston 39144942da
Fix title ordering 5 years ago
Travis Ralston 010757c01d
Merge pull request #2057 from matrix-org/anoa/clarify_email_sending
Clarify what the client should receiving on email resending
5 years ago
Andrew Morgan 13e7dbd53a Merge branch 'anoa/clarify_email_sending' of github.com:matrix-org/matrix-doc into anoa/clarify_email_sending 5 years ago
Andrew Morgan 49b9bfc9f6 Move changelog to the right place 5 years ago
Andrew Morgan 0b42a17352
Update api/identity/definitions/request_email_validation.yaml
Co-Authored-By: Travis Ralston <travpc@gmail.com>
5 years ago
Bruno Windels 53aa8fe8ec clarify the order events in chunk for /messages 5 years ago
Travis Ralston 86019c9ade Skip over partial event definitions in examples 5 years ago
Travis Ralston 0b45f3795b Rename example to invite_room_state
This is a better representation of what it actually is
5 years ago
Travis Ralston 237d585e07 Shorten references to StrippedState in s2s spec 5 years ago
Travis Ralston b9c4a2561f Fix examples of StrippedState in s2s spec 5 years ago
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.
5 years ago
Travis Ralston dda7afa845
Merge pull request #1717 from uhoreg/e2e_verification
MSC1717: common definitions for key verification methods
5 years ago
Travis Ralston 57e3b152b0 Move section to under Olm stuff 5 years ago
Travis Ralston 754b19bb92
typo
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
5 years ago
Travis Ralston ad07d8e6ff
Merge pull request #2051 from matrix-org/travis/1.0/fix-examples
Use consistent event examples throughout the Client-Server API
5 years ago
Travis Ralston d7f37f92eb Merge branch 'master' into travis/1.0/fix-examples 5 years ago
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.
5 years ago
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.
5 years ago
Travis Ralston d48265f49b typo 5 years ago
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
5 years ago
Travis Ralston 9d7289f4f2
Merge pull request #2049 from matrix-org/travis/1.0/store-invite-params
Add missing aesthetic parameters to /store-invite
5 years ago
Travis Ralston a2f955b50d
Merge pull request #2053 from matrix-org/travis/1.0/required-urls
Make url required for m.file-like messages
5 years ago
Travis Ralston ff33b470a4
Merge pull request #2039 from matrix-org/travis/1.0/more-changelogs
Fix more changelog entries
5 years ago
Andrew Morgan dda8976d25 Add changelog 5 years ago
Andrew Morgan c0c4629993
Slight word change 5 years ago