Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-02-19 04:23:43 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5947 commits 28 branches 42 tags 34 MiB
Commit graph

1188 commits

Author SHA1 Message Date
Richard van der Hoff 7d757ce8fa minor wording tweaks 2021-03-17 13:18:28 +00:00
Richard van der Hoff dcb18f03dc Move security consideration to MSC2962 
I think the peeking thing is specific to access control.
 2021-03-17 13:14:53 +00:00
Richard van der Hoff 469b64c5cd rip out m.room.description 
if/when we need it, we should follow MSC2875
 2021-03-16 14:23:12 +00:00
Richard van der Hoff 62b9154fa7 Remove lost footnotes 
These should have been part of MSC2962.
 2021-03-16 14:18:27 +00:00
Richard van der Hoff bc1466206d related MSCs 2021-03-16 14:16:26 +00:00
Richard van der Hoff 1cfe6bc0ae MSC1840 is out again. 2021-03-16 14:00:17 +00:00
Richard van der Hoff a8a7acce1e update UIA 2021-03-09 18:10:17 +00:00
Richard van der Hoff 49f7624d55 update brand descriptions 2021-03-09 18:07:37 +00:00
Richard van der Hoff d5166ebc1a
Update proposals/2858-Multiple-SSO-Identity-Providers.md 2021-03-09 18:04:19 +00:00
Andrew Morgan 68d2d7cfdb Note that homeservers should pass down invites to the client if they fail on autojoin 2021-03-09 17:16:25 +00:00
Richard van der Hoff 7871da7565
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
 2021-03-09 16:53:16 +00:00
Richard van der Hoff 1ba0c39b14 Change the brand identifiers again 2021-03-09 14:37:30 +00:00
Richard van der Hoff 178cbe1c3a
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-03-03 18:50:27 +00:00
Andrew Morgan 8bfef19a39 Remove further traces of old /rooms/roomId/knock CS endpoint 2021-03-03 17:35:49 +00:00
Andrew Morgan ef840c1b53 Split the 'Membership change to ' section into rejecting/rescinding knocks 2021-03-03 17:33:26 +00:00
Andrew Morgan 6556b95233 Move API endpoint sections up to the top of the proposal 2021-03-03 17:25:17 +00:00
Andrew Morgan c915b6442b Update alternatives section 2021-03-03 17:13:29 +00:00
Andrew Morgan 09018be96c Link to existing spec documentation on the public rooms directory 2021-03-03 17:02:26 +00:00
Andrew Morgan 53ad7e3f66 Ensure we return the room_id after knocking via the CS API 2021-03-03 17:01:26 +00:00
Andrew Morgan c575f88d13 Move endpoint extras under endpoint's header 2021-03-03 16:53:17 +00:00
Andrew Morgan c9f34e818e Link to /join/roomIdOrAlias 2021-03-03 16:50:54 +00:00
Richard van der Hoff a596efdf8b Get rid of the registry for now 
it should just be a proposal. We can add the registry later.
 2021-03-03 11:51:25 +00:00
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 ddbcba454c
Fix typo 
Co-authored-by: Sorunome <mail@sorunome.de>
 2021-02-15 10:20:48 -05: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
Hubert Chathi de65f4e1fe
Add link to keys upload endpoint 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2021-01-26 15:21:25 -05: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
Matthew Hodgson ff85e61be9 fix dev identifier 2021-01-15 11:19:45 +00:00
Matthew Hodgson a709671d03 tie break on multiple parents 2021-01-14 12:55:20 +00:00
Matthew Hodgson a0f89bd522 add XXX about via propagation 2021-01-14 02:23:59 +00:00
Matthew Hodgson b10856d49d let's create spaces with events_default PL100 2021-01-14 02:07:03 +00:00
Matthew Hodgson 91fe7a79b6 switch to allowing multiple parents 
to accomodate @Sorunome's use cases for secret rooms to exist in multiple spaces.
also remote , as we always have  now we use room ids
 2021-01-14 02:02:27 +00:00
Matthew Hodgson 97103c44cd clarify that auto-joins are not force joins 2021-01-14 01:39:52 +00:00
Matthew Hodgson 343e1f676b incorporate @joepie91's clarification on secret rooms 2021-01-14 01:37:05 +00:00
Matthew Hodgson f8fb32518d replace m.room.parent with m.space.parent for symmetry 2021-01-14 01:35:38 +00:00
Matthew Hodgson b8e3a0b45d include invite state notes 2021-01-14 01:34:34 +00:00
Matthew Hodgson a0d06c7bd7 factor out ACLs into a separate MSC 2021-01-14 01:34:10 +00:00
Matthew Hodgson 302d5d87b4 clarify autojoin and mention 'suggested' rooms 2021-01-13 17:29:43 +00:00
Matthew Hodgson 2de3dc4f70 more plurality fixing 2021-01-13 15:41:31 +00:00
Matthew Hodgson 42c332bd88 fix parent claiming plurality 2021-01-13 15:34:50 +00:00
Matthew Hodgson 803e70a8b3 typo 2021-01-13 14:18:39 +00:00
Matthew Hodgson 037894a641 replace 'default' with 'auto_join' 2021-01-13 14:01:17 +00: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
Richard van der Hoff 69897584e1
Update proposals/1772-groups-as-rooms.md 
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
 2021-01-04 13:43:59 +00: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
Will Hunt 5c00004317
Add notice about identifer 2020-11-30 17:16:41 +00:00
Will Hunt 7d9304fdde
Clarify _bridge_alice 
Co-authored-by: Tulir Asokan <tulir@maunium.net>
 2020-11-30 17:13:54 +00:00
Andrew Morgan 7dcff8f2e1 Disallow invite->knock membership changes 2020-11-27 11:04:21 +00:00
Richard van der Hoff 51aa5e2c40
Update proposals/1772-groups-as-rooms.md 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-11-26 17:54:54 +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
Richard van der Hoff 6cc3995ce8 explain a bit 2020-11-20 13:22:44 +00:00
Richard van der Hoff 45f260836d No cross-room auth 2020-11-20 13:19:22 +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
Peter Gervai 39af7f3249
Update 1772-groups-as-rooms.md (#2866) 
Typo.
 2020-11-17 15:30:17 +00:00
Richard van der Hoff d4abe40677 one parent per room 2020-11-16 11:57:04 +00:00
Richard van der Hoff 1f1e3c9a0f MSC1840 is in 2020-11-16 11:50:17 +00: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
Richard van der Hoff fbad757ceb update dependencies links 2020-11-11 17:52:16 +00:00
Richard van der Hoff e6a6941845 rename allowed_join again 2020-11-11 16:50:21 +00:00
Richard van der Hoff 3b2825f21d Descope autokick and rename allowed_spaces 2020-11-11 16:38:19 +00:00
Richard van der Hoff 4e3b0ed05f add a length limit to order 2020-11-11 16:03:32 +00:00
Richard van der Hoff b40f7da8d2 Record alternatives 
make sure we have records of dismissed alternatives
 2020-11-11 15:56:52 +00:00
Richard van der Hoff ae71a6219a Restricting room membership via spaces 2020-11-11 12:13:42 +00: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
Richard van der Hoff 29b07c11ad update power level mappings 2020-11-10 12:56:16 +00:00
Richard van der Hoff 06b5c8342f notes on children and recursion 2020-11-10 12:08:29 +00:00
Richard van der Hoff 109c31c2c8 Avoiding abuse via false parent claims 2020-11-10 11:45:37 +00:00
Richard van der Hoff 839ea0e946 inheriting join rules 2020-11-09 15:11:59 +00:00
Richard van der Hoff a73dd9c371 clarification 2020-11-09 15:11:48 +00:00
Richard van der Hoff e323ade5f7 Switch to room IDs 2020-11-09 15:11:16 +00:00
Richard van der Hoff 1aede33b35 clarify introduction 2020-11-09 12:30:02 +00: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
Richard van der Hoff d42da585e5
Apply suggestions from code review 
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
 2020-11-09 12:09:48 +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 11bb604c5e add an xxx 2020-10-30 18:47:37 +00:00
Richard van der Hoff 2f557daac1 Clarifications to room/space relationship 2020-10-30 18:46:05 +00:00
Richard van der Hoff e746aa3aad
Apply suggestions from code review 
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
 2020-10-30 11:16:32 +00:00
Richard van der Hoff 15f34e5be9 supporting trad PLs 2020-10-29 13:07:21 +00:00
Richard van der Hoff 5db56391f3
spelling 2020-10-29 12:21:46 +00:00
Richard van der Hoff c145d398f7 Notes on propagating PLs etc 2020-10-29 11:23:48 +00:00