Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-06 07:53:42 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
5742 commits 30 branches 42 tags 32 MiB
Commit graph

1050 commits

Author SHA1 Message Date
Travis Ralston 124c8d43d3
Apply suggestions from code review 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2021-01-12 09:22:06 -07:00
Travis Ralston 22acbea0ed
Apply suggestions from code review 
Co-authored-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
 2021-01-09 20:38:58 -07:00
Travis Ralston 7b4e702a69 Remove patch versions, policy stuff, etc 2021-01-09 20:33:20 -07:00
Hubert Chathi 7678884376 clarifications to cross-signing MSC 2021-01-08 17:48:03 -05:00
Travis Ralston b07618cc3f Make clarifications to the spec 2020-12-15 09:49:27 -07:00
Travis Ralston 8d6642aaa7 Merge branch 'master' into travis/msc/global-versioning 2020-12-15 09:34:59 -07:00
Hubert Chathi affa240543 use reason for human-readable cancel reason 
for consistency with non-DM version
 2020-12-14 11:35:12 -05:00
Travis Ralston 6ccc548912 Revert "Merge branch 'travis/msc/1337-joined-rooms'" 
This reverts commit 0961c7b0f7.
 2020-12-07 14:34:10 -07:00
Hubert Chathi 4a779784ef
Update proposals/2241-e2e-verification-in-dms.md 
Co-authored-by: poljar <poljar@termina.org.uk>
 2020-12-06 09:43:53 -05:00
Travis Ralston 942e8b36e4 Convert to markdown verbatim 2020-12-04 10:38:14 -07:00
Andrew Morgan 7dcff8f2e1 Disallow invite->knock membership changes 2020-11-27 11:04:21 +00:00
Michael Telatynski 153c55788d Add more explanation 2020-11-26 10:47:05 +00:00
Travis Ralston bce1bf3210
Merge pull request #1544 from uhoreg/qr_key_verification 
MSC1544: Key verification using QR codes
 2020-11-25 13:26:28 -07:00
Hubert Chathi 11d6e42ee1 use MSC number 2020-11-23 12:18:44 -05:00
Hubert Chathi f7a397dc90 add proposal for Single SSSS 2020-11-23 12:14:22 -05:00
Travis Ralston 11daaf6ea9 Add a small note about widgets 2020-11-22 18:58:36 -07:00
Travis Ralston 8cc3d44c2a Generally wording changes; Change deprecation 2020-11-22 01:22:05 -07:00
Travis Ralston 09c569f1a7 Cover a case of no-op versions 2020-11-22 01:03:54 -07:00
Hubert Chathi 9db8cc98d9
Update proposals/1543-qr_code_key_verification.md 
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
 2020-11-20 22:52:41 -05:00
Andrew Morgan 6c75b83b99 Address Travis and Patrick's feedback 2020-11-20 16:45:45 +00:00
Travis Ralston 74746634af
Apply suggestions from code review 
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2020-11-19 08:18:45 -07:00
Michael Telatynski 8ac23599b2 Iterate MSC based on feedback 2020-11-19 09:36:34 +00:00
Hubert Chathi 0b97ac59bf event IDs use $ 2020-11-18 22:52:06 -05:00
Michael Telatynski f444273a42 be stricter on the icon url 2020-11-13 12:00:45 +00:00
Michael Telatynski 874e32d69d Merge remote-tracking branch 'origin/t3chguy/msc/multi-sso' into t3chguy/msc/multi-sso 2020-11-13 11:41:13 +00:00
Michael Telatynski a391a4a05d Iterate the MSC 2020-11-13 11:41:06 +00:00
Travis Ralston d079d7d2d3 Answer question about confusing deprecation with not 2020-11-12 17:51:22 -07:00
Travis Ralston 1310c7c8bf Finish up the last few sections 2020-11-12 17:45:26 -07:00
Michael Telatynski 20645365f4
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2020-11-12 12:50:37 +00:00
Travis Ralston 940bb49027
Merge pull request #2774 from matrix-org/travis/msc/widget-id 
MSC2774: Expose the widget ID to the widget
 2020-11-11 12:52:50 -07:00
Travis Ralston 4dee8dbeab Versioning WIP 2020-11-10 16:31:53 -07:00
Travis Ralston 973ee1438c Progress checkpoint on room versions 2020-11-10 12:51:50 -07:00
Michael Telatynski a7eba773be Fix MSC number 2020-11-09 12:14:57 +00:00
Michael Telatynski 204732099b Multiple SSO Identity Providers 2020-11-09 12:11:07 +00:00
Travis Ralston c4d01b90e9
Merge pull request #2765 from matrix-org/travis/msc/widget-avatars 
MSC2765: Widget avatars
 2020-11-07 10:52:38 -07:00
Travis Ralston 5f8b7167a5 What if we versioned the whole spec? 2020-10-30 13:57:23 -06:00
Richard van der Hoff 5db56391f3
spelling 2020-10-29 12:21:46 +00:00
Travis Ralston 4ee990e26f
Merge pull request #2758 from matrix-org/rav/proposals/textual_identifier_grammar 
MSC2758: Proposal for a common identifier grammar
 2020-10-25 13:09:57 -06:00
Travis Ralston ee55d9d35b
Update proposals/2765-widget-avatars.md 
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
 2020-10-22 11:23:32 -06:00
Richard van der Hoff 49ce93f3e2
Update 2758-textual-id-grammar.md 2020-10-20 14:41:37 +01:00
Hubert Chathi 7b3c98cd98 we're using the binary format 2020-10-16 22:43:04 -04:00
Travis Ralston 411202f2bf
spelling 
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
 2020-10-09 10:16:01 -06:00
Andrew Morgan 815dae6eae Note that redactions of knocks are not a concern 2020-10-08 18:04:32 +01:00
Travis Ralston 9e66d32225
Merge pull request #2414 from iinuwa/master 
MSC2414: Make reason and score parameters optional for reporting content
 2020-10-07 08:08:48 -06:00
Andrew Morgan a924f5b3d5 Fix incorrect assumptions about the sender field of a knock event 
Got a bit confused with the sender and state_key being different in invite
membership events. In case of a knock, even if the knock event is being
inserted into the room by another homeserver over federation, the sender
of the event is still the knocking user, just like the state_key.
 2020-10-05 20:24:56 +01:00
Andrew Morgan 525d1d33e0 Some clarifications and wording fixes 2020-10-05 17:09:33 +01:00
iinuwa 02512f0f69
Use endpoint instead of API 
Co-authored-by: Jonas Platte <jplatte@users.noreply.github.com>
 2020-10-02 09:12:18 -05:00
Travis Ralston 51b278e015 Mention the endpoint 2020-10-02 07:42:35 -06:00
Richard van der Hoff 12da19f927 Words on e2ee events 2020-10-02 09:26:59 +01:00
Richard van der Hoff 46440b0e75 On why you should never trust an event. 2020-10-01 23:33:17 +01:00
Andrew Morgan 6f7bcb6052 Explicitly state what changes to the auth rules are necessary 2020-10-01 18:49:41 +01:00
Andrew Morgan 5097fad4e7 Fix unstable prefix bullet points 2020-10-01 17:43:49 +01:00
Kitsune Ral 11d2529a5e Allow custom query items 2020-10-01 18:37:39 +02:00
Andrew Morgan 6b99228386 Remove section duplicated by membership change section 2020-10-01 17:25:19 +01:00
Andrew Morgan fd8176b93d Clarify endpoint calls clients and servers need to use to handle knocks 2020-10-01 17:09:10 +01:00
Andrew Morgan 9e5ac042ac Explicitly state that the hs that received the knock must put in the room 2020-10-01 16:35:39 +01:00
Andrew Morgan e58e207bbf Go into more depth about membership changes surrounding knocking 2020-10-01 16:20:15 +01:00
Kitsune Ral a2fa637396 Refactor of non-normative sections 
Including a few more words regarding the "minimal encoded"
(aka "keep sigils") alternative.
 2020-10-01 14:41:10 +02:00
Kitsune Ral 758c57b021 More cleanup 2020-10-01 14:33:03 +02:00
Kitsune Ral 6f082bbe12 Be clearer about percent-en/decoding 2020-09-30 08:04:02 +02:00
Kitsune Ral bbc8bfc1c0 Rework the path grammar for better clarity 2020-09-29 21:30:03 +02:00
Kitsune Ral 907bd2e2a2 Rewording, clarifications, minor fixes 2020-09-29 21:29:44 +02:00
Kitsune Ral 438e5a368f Add URI operations and construction algorithm 2020-09-29 21:11:45 +02:00
iinuwa 07dbdab898
Fix typos 2020-09-23 16:37:26 -05:00
iinuwa 9be28c5ade
Add proposal to remove score; reorganize 2020-09-23 16:34:46 -05:00
Travis Ralston 2ccdcead9c Fix number 2020-09-23 07:48:28 -06:00
Travis Ralston 9f06c0a2e2 What if we make v6 as the default? 2020-09-23 07:46:38 -06:00
Travis Ralston 561043663f
Merge pull request #1960 from matrix-org/travis/msc/integrations/openid 
MSC1960: OpenID information exchange with widgets
 2020-09-20 11:46:35 -06:00
Andrew Morgan 340f888de3 Mention unstable prefixes for sync, join_rules and membership events 2020-09-16 16:05:27 +01:00
Andrew Morgan 6e47e86f01 Add unstable endpoint replacements 2020-09-16 15:57:12 +01:00
Travis Ralston b3116e4a3c Proposal to have widgets aware of their widget ID 2020-09-11 13:36:46 -06:00
Travis Ralston c9e8326783 Reword following widget spec 2020-09-05 14:56:34 -06:00
Andrew Morgan fd9d57b8c4 Match state events sent to a remote server when inviting a user 2020-09-04 14:38:29 +01:00
Andrew Morgan 630f7c458c Allow users to knock over and over, removing CS complexity 2020-09-04 14:26:15 +01:00
Andrew Morgan 61fea58ce0 Merge branch 'soru/knock' of github.com:sorunome/matrix-doc into soru/knock 2020-09-03 16:08:46 +01:00
Andrew Morgan 703fa07028 Remove extraneous text 2020-09-03 16:07:16 +01:00
Travis Ralston 70e69a110a Move the avatar up a level 2020-09-03 09:00:36 -06:00
Travis Ralston d8bc158a3b Renumber 2020-09-03 08:55:27 -06:00
Travis Ralston 1f734cd4a9 Proposal to support widget avatars 2020-09-03 08:53:10 -06:00
Andrew Morgan 58cb299dde
Update proposals/2403-knock.md 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2020-09-03 13:47:20 +01:00
Andrew Morgan c9a7b442ff Merge branch 'soru/knock' of github.com:sorunome/matrix-doc into soru/knock 
* 'soru/knock' of github.com:sorunome/matrix-doc:
  Federation knock_room_state and minor cleanup
 2020-09-02 23:15:26 +01:00
Richard van der Hoff 998dec2980
Update proposals/2758-textual-id-grammar.md 2020-09-02 17:50:15 +01:00
Andrew Morgan e93a19f62d Indicate that this proposal requires a new room version 2020-09-02 12:07:44 +01:00
Richard van der Hoff 49e4e61e80
fix typos 
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
 2020-09-01 22:34:31 +01:00
Richard van der Hoff b3f40fb553 fix a couple of typos 2020-09-01 18:23:46 +01:00
Richard van der Hoff 1688f12d08 Proposal for a common identifier grammar 2020-09-01 18:19:56 +01:00
Andrew Morgan 5bfd65c59f Federation knock_room_state and minor cleanup 2020-08-28 13:56:09 +01:00
Andrew Morgan ae8ec6603c Spec how a client is notified of pending knock progress 2020-08-27 18:35:06 +01:00
Travis Ralston e304109289 fix widget example 2020-08-27 08:21:41 -06:00
Travis Ralston 4cb7e96b11
Apply suggestions from code review 
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2020-08-27 08:13:12 -06:00
Andrew Morgan 965c47ba08 Remove unnecessary sentence 2020-08-27 15:03:18 +01:00
Andrew Morgan 651e73b2db It's possible to fight against spam 2020-08-27 15:00:17 +01:00
Andrew Morgan f3fc5399fc Move client recommendations into its own section 
Hopefully leading to less duplication in recommendations as well
 2020-08-27 14:59:11 +01:00
Andrew Morgan aad6ff4a05 Remove remaining traces of [200, {}] response format 2020-08-25 16:02:11 +01:00
Andrew Morgan bc90f1ce47 Fix typo 2020-08-25 15:56:10 +01:00
Travis Ralston 3943e63ae2
Merge pull request #2738 from matrix-org/revert-2737-revert-2033-travis/msc/whoami-device 
TBD: MSC2033: Adding a device_id to /account/whoami
 2020-08-23 08:51:31 -06:00
Andrew Morgan 105108428f Switch from Power Levels -> Join Rules 2020-08-21 18:50:40 +01:00
Andrew Morgan d6d5858b67 knock->knock and rescinding of knocks are not allowed 2020-08-21 17:08:02 +01:00
Andrew Morgan 716db4e656 Spell out some possible abuse vectors and how to mitigate them 2020-08-21 15:42:12 +01:00
Andrew Morgan 74a341ab8d Mention that knock -> ban is possible 2020-08-21 15:36:38 +01:00
Travis Ralston 80214998f6 Various clarifications to structure 2020-08-21 08:34:35 -06:00
Andrew Morgan 39c21689ce small grammar 2020-08-21 15:30:30 +01:00
Travis Ralston df74c7dbe3 Merge branch 'master' into travis/msc/integrations/openid 2020-08-21 08:14:28 -06:00
Travis Ralston 6490fda6ee
Apply suggestions from code review 
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2020-08-21 07:07:41 -06:00
Richard van der Hoff c00710d91a Revert "Merge pull request #1598 from matrix-org/rav/proposals/id_grammar" 
This reverts commit d9135ef902, reversing
changes made to f714aaadd0.

People are getting confused by the fact this has been merged.
 2020-08-19 15:12:54 +01:00
Travis Ralston 9080c5f87f
Revert "Revert "MSC2033: Adding a device_id to /account/whoami"" 2020-08-18 08:53:34 -06:00
Travis Ralston ddc0d78e0c
Revert "MSC2033: Adding a device_id to /account/whoami" 2020-08-18 08:53:13 -06:00
Travis Ralston 0228cf8361
Merge pull request #2033 from matrix-org/travis/msc/whoami-device 
MSC2033: Adding a device_id to /account/whoami
 2020-08-18 08:47:00 -06:00
Andrew Morgan de038f5601 Fix the response format of send_knock 
This aligns with the current v2 federation endpoints. However, we're still using v1
as a prefix here as it is still the first version of this endpoint.
 2020-08-17 14:30:28 +01:00
Andrew Morgan 38d67083eb Note that spam is a preventable, but real possibility as a result 2020-08-17 14:27:59 +01:00
Andrew Morgan c92752d1b8 Reflow text to <79 chars 2020-08-17 14:25:34 +01:00
Andrew Morgan d47cb1fec3 Small grammatical fixes 2020-08-17 14:23:33 +01:00
Travis Ralston 65c6d545b8 assign number 2020-07-30 10:59:00 -06:00
Travis Ralston 1be21b85b6 Proposal to remove deprecated identity service endpoints 2020-07-30 10:57:18 -06:00
Travis Ralston 5c0f999503
Merge pull request #2689 from Awesome-Technologies/fix_guest_e2ee 
MSC2689: Fix E2EE for guests
 2020-07-29 08:18:35 -06:00
Travis Ralston 0973e88c7c
Merge pull request #2663 from matrix-org/rei/pushrules_define_enabled 
MSC2663: Errors for dealing with non-existent push rules
 2020-07-29 08:15:41 -06:00
Travis Ralston a96a014512
Merge pull request #2610 from matrix-org/rav/proposal/remove-oauth2-auth-type 
MSC2610: Remove `m.login.oauth2` User-Interactive Authentication type from the specification
 2020-07-28 10:01:36 -06:00
Travis Ralston 5990d98525
Merge pull request #2611 from matrix-org/rav/proposal-remove-token-auth-type 
MSC2611: Remove `m.login.token` User-Interactive Authentication type from the specification
 2020-07-28 09:58:55 -06:00
Kitsune Ral b4b917c6c8 Another wording fix 2020-07-25 19:00:56 +02:00
Kitsune Ral c3329fe644
Wording/grammar fixes from code review 
Co-authored-by: Denis Kasak <dkasak@termina.org.uk>
 2020-07-25 18:59:06 +02:00
Kitsune Ral eeb5ce222c Intro: rephrase a paragraph as per review 2020-07-25 17:00:30 +02:00
Kitsune Ral c60368338c
Apply suggestions from code review 
Co-authored-by: Mayeul Cantan <mayeul.cantan@gmail.com>
 2020-07-25 12:44:23 +02:00
Kitsune Ral 7b574448db
Fix a broken link 
Co-authored-by: Denis Kasak <dkasak@users.noreply.github.com>
 2020-07-25 12:42:52 +02:00
Kitsune Ral 294f30f3ab
Reword, as per review 
Co-authored-by: Mayeul Cantan <mayeul.cantan@gmail.com>
 2020-07-25 11:55:18 +02:00
Michael Albert 78f3c3dac8
Update proposals/2689-fix-e2ee-for-guests.md 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2020-07-24 21:47:45 +02:00
Kitsune Ral bcf5585e55
Remove authority from the example for unfederated room 
Co-authored-by: Mayeul Cantan <mayeul.cantan@gmail.com>
 2020-07-23 15:51:52 +02:00
Kitsune Ral 812df4c9c1 Out of WIP; early feedback incorporated 
- Authority part semantics are no more prescribed; authority part has
  defined syntax but reserved for future use.
- Moved away non-normative parts to "Discussion" and/or "Alternatives"
- Added `action=chat`
- Extended `via=` applicability to non-roomid cases to compensate
   dropping the authority part semantics.
- Added a reference algorithm to parse a URI.
- Closed outstanding questions/discussion points.
- Added more cases for future evolution.
- Added "minimal syntax" options to the discussion of possible
  alternatives
 2020-07-22 17:06:09 +02:00
Olivier Wilkinson (reivilibre) 3dd5bc42a7 inexistent may or may not be a non-existent word 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2020-07-17 13:06:13 +01:00
Michael Albert 250f0e47c1 Fix typos 2020-07-15 22:06:19 +02:00
Michael Albert adc867dc99 Fix E2EE for guests 2020-07-15 21:47:28 +02:00
Travis Ralston e207dfc0ea
Merge pull request #2630 from uhoreg/sas2 
MSC2630: checking public keys in SAS verification
 2020-07-11 10:36:55 -06:00
Olivier Wilkinson (reivilibre) 90a37cdb30 Write MSC2663 2020-07-06 12:36:08 +01:00
Olivier Wilkinson (reivilibre) fee59be2b3 Start MSC2663 proposal 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2020-07-03 14:03:31 +01:00
Patrick Cloke 782aed7383
Add proposal for accepting query parameters to the login fallback endpoint. (#2604) 2020-06-28 17:00:32 +01:00
Isaiah Inuwa bbad4c453f Add backwards-compatibility notes. 2020-06-19 22:45:03 -05:00
Brendan Abolivier f1e3118317 Revert "MSCXXXX: Ability for clients to request homeservers to resync device lists" 
This reverts commit 79dc04515e562847774e2f722fb14401bfb90583.
 2020-06-15 20:35:58 +01:00
Brendan Abolivier 9b7a883b50
MSCXXXX: Ability for clients to request homeservers to resync device lists 2020-06-15 20:35:21 +01:00
Travis Ralston ffd739137e
Merge pull request #2399 from uhoreg/reporting_no_key 
MSC2399: Reporting that decryption keys are withheld
 2020-06-13 09:40:23 -06:00
Hubert Chathi 6ca3996bef FluffyChat doesn't include any verification yet 2020-06-11 16:39:08 -04:00
Hubert Chathi 1961a215e8
Fix the title 2020-06-11 16:36:25 -04:00
Hubert Chathi d9dc3dc180 rename to match MSC number 2020-06-11 16:30:47 -04:00
Hubert Chathi 0fbb1b9bf9 add information on fixed implementations 2020-06-11 16:25:07 -04:00
Richard van der Hoff ac982410b9
Apply suggestions from code review 
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2020-06-11 11:18:29 +01:00
Richard van der Hoff 4aa778cdee
Put the MSC number in the proposal template (#2622) 
this seems to be our convention.
 2020-06-10 13:40:12 +01:00
Hubert Chathi c741049760 more clarifications 2020-06-08 22:57:11 -04:00
Travis Ralston 34f2d482be
Merge pull request #2265 from matrix-org/babolivier/msc_email_case 
MSC2265: Proposal for mandating case folding when processing e-mail address localparts
 2020-06-07 11:37:28 -06:00
Richard van der Hoff 1e049481fe Proposal to remove m.login.token ui auth type 2020-06-05 10:52:37 +01:00
Richard van der Hoff 7549b86192 Proposal to remove m.login.oauth2 2020-06-05 10:15:55 +01:00
Hubert Chathi f8e4bdfbaf credit David Wong 2020-06-02 17:31:15 -04:00
Travis Ralston ac187904bb Update MSC1779 to forward link to matrix.org/foundation 2020-05-25 08:35:26 -06:00