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

1046 commits

Author SHA1 Message Date
Richard van der Hoff 62cc76f28b Move sequence diagram into doc 2021-03-03 11:33:03 +00:00
Richard van der Hoff 2d4da148d8
more fix markdown 2021-03-02 19:19:45 +00:00
Richard van der Hoff dce9c9f09a Move the idp brand assignments out to a registry 2021-03-02 19:14:11 +00:00
Michael Telatynski ba3e204a48
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
 2021-03-01 22:25:45 +00:00
Richard van der Hoff 6badb3b6d8 Notes on OAuth2 and unknown idps 2021-03-01 19:19:41 +00:00
Andrew Morgan 49a72862a9 Allow knock->knock transitions 2021-02-26 12:08:14 +00:00
Andrew Morgan 2acc0a697b Clarify prose 2021-02-25 18:59:38 +00:00
Andrew Morgan e790ad2120
Apply suggestions from code review 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2021-02-24 18:45:11 +00:00
Travis Ralston fadee276d2 Alter to reserve v7 instead of declare v7 2021-02-22 11:56:53 -07:00
Andrew Morgan 24f61c283c Note that implementations may choose to auto-accept knock-related invites 2021-02-18 17:11:01 +00:00
Andrew Morgan eda65847a3 Comment on push rules 2021-02-18 17:07:31 +00:00
Andrew Morgan 248a3da5ca Switch /send_knock/ from v2 to v1; leave a note as to why 2021-02-18 16:49:03 +00:00
Andrew Morgan 97109d4268 Remove MSC2175, MSC2174 due to lack of implementation 2021-02-18 15:49:51 +00:00
Alexey Rusakov b4269a54e8 Use abbreviated type specifiers 
As per the review, this commit introduces Reddit-style type specifiers
for user ids (u/), room aliases (r/), and event ids (e/).
 2021-02-17 21:14:02 +01:00
Andrew Morgan 74f3b12a17 Note experimental room version ID 2021-02-17 12:15:38 +00:00
Andrew Morgan 04cd6b3d3e
fix typo 
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
 2021-02-17 12:13:44 +00:00
Andrew Morgan 337c87b949 Add 404 on make_knock if unknown room ID 2021-02-17 12:11:08 +00:00
Andrew Morgan 8400877574 Make ver a required parameter for make_knock 2021-02-17 11:02:21 +00:00
Andrew Morgan d5a2a284c5 Note clients should try to prevent impersonation attacks during knocking 2021-02-17 10:34:04 +00:00
Hubert Chathi 356d1fe3e3 add example 2021-02-11 16:48:32 -05:00
Andrew Morgan 5c620de273 typo fix 2021-02-10 17:29:59 +00:00
Andrew Morgan 6a0d07c799 Public rooms directory backwards compatibility note 2021-02-09 11:18:55 +00:00
Andrew Morgan 51a7778217 typo 2021-02-08 18:38:38 +00:00
Andrew Morgan e99649cb84 Foreshadow power level requirements for approval/denial of knock 2021-02-08 18:37:08 +00:00
Andrew Morgan 336e5a2c7a
v6 -> v7 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-02-08 18:04:48 +00:00
Andrew Morgan 1f07f0dc9a MSC2998 2021-02-08 11:50:56 +00:00
Andrew Morgan 3735def108 Define room version 7 2021-02-08 11:50:53 +00:00
Andrew Morgan 42e01b8e91 Add join_rules to room chunks returned on a public room dir query 2021-02-02 19:50:41 +00:00
Travis Ralston 315cf67f6b
Merge pull request #2366 from uhoreg/key_verification_accept 
MSC2366: Key verification flow additions: m.key.verification.ready and m.key.verification.done
 2021-01-31 10:06:36 -07:00
Richard van der Hoff ba08c9fe36 notes on and alternatives 2021-01-27 16:48:32 +00:00
Richard van der Hoff 84346055e9
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-01-27 15:22:03 +00:00
Richard van der Hoff 09d41c59b9 add 'brand' 2021-01-27 13:00:12 +00:00
Richard van der Hoff 0c18f83636 grammar clarifications 2021-01-27 12:45:11 +00:00
Richard van der Hoff 277ff682d6 Formatting tweaks 2021-01-27 12:43:26 +00:00
Alexey Rusakov 246a97e2be Add clarification as per review 2021-01-22 19:59:41 +01:00
Alexey Rusakov eca999382d Grammar 2021-01-22 18:39:33 +01:00
Kitsune Ral 3988979f82 Fix leftovers 2021-01-19 22:02:58 +01:00
Kitsune Ral 43e6470aca Drop 'group' in anticipation of #1772 2021-01-19 19:59:03 +01:00
Kitsune Ral a32d7f5027 Apply suggestions from code review 2021-01-19 19:44:15 +01:00
Hubert Chathi d9edb3fdf3
Apply suggestions from code review 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2021-01-19 12:59:59 -05:00
Michael Telatynski 1d90cacf6e Merge branch 't3chguy/msc/multi-sso' of github.com:matrix-org/matrix-doc into t3chguy/msc/multi-sso 2021-01-19 13:53:10 +00:00
Michael Telatynski 85ccf93c6a Remove UIA stuff 2021-01-19 13:52:57 +00:00
Michael Telatynski 8be6540eaf
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2021-01-19 13:43:49 +00:00
Michael Telatynski c7063a4eec Iterate PR based on feedback 2021-01-18 09:30:07 +00:00
Travis Ralston 5800dcb654
Merge pull request #2844 from matrix-org/travis/msc/global-versioning 
MSC2844: Global version number for the whole spec
 2021-01-17 12:58:42 -07:00
Travis Ralston 46d843e8fa Make deprecation industry standard 2021-01-12 09:52:50 -07:00
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