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

739 commits

Author SHA1 Message Date
Hubert Chathi b7234c7fd3 add unstable prefix section to proposal template 2019-11-29 15:51:50 -05:00
Travis Ralston f37aa30c43
Merge pull request #1756 from uhoreg/cross-signing2 
MSC1756: cross-signing devices using a master identity key
 2019-11-26 10:00:44 -07:00
Erik Johnston f054ffe760 Add note about using PUT /state/m.room.member/ 2019-11-26 11:40:38 +00:00
Erik Johnston 29745d04fb erikj/msc_membership_reasons 2019-11-26 11:22:42 +00:00
Travis Ralston 2a82a5c27c
Merge pull request #2313 from matrix-org/msc2313 
MSC2313: Moderation policies as rooms (ban lists)
 2019-11-25 09:17:33 -07:00
Hubert Chathi 82260689c9 add link to migrating from device verifications 2019-11-20 11:55:10 -05:00
Hubert Chathi 3b2f897c7e
Apply suggestions from code review 
Co-Authored-By: Matthew Hodgson <matthew@arasphere.net>
 2019-11-20 11:48:36 -05:00
Travis Ralston c7b3d99853 m.policy.rule won the debate 2019-11-19 11:53:07 -07:00
Travis Ralston f1ff31d2cb
Merge pull request #2284 from matrix-org/travis/msc/optional-is-discover 
MSC2284: Making the identity server optional during discovery
 2019-11-18 10:15:48 -07:00
Travis Ralston f610235cd6 Rename the MSC to be better targeted 2019-11-18 09:38:17 -07:00
Travis Ralston 605f3390c7
Merge pull request #1946 from uhoreg/ssss 
MSC1946: Secure Secret Storage and Sharing
 2019-11-13 10:07:05 -07:00
Travis Ralston 037894d6f7
Merge pull request #2244 from tulir/mass_redactions 
MSC2244: Mass redactions
 2019-11-12 08:56:38 -07:00
Hubert Chathi fc793557f8 make the default key event an object 2019-11-12 10:48:38 -05:00
Travis Ralston dcbdb94693
Add explanation 2019-11-08 09:03:49 -07:00
Hubert Chathi e8ce135a41 add clarification and examples 2019-11-07 19:01:30 -05:00
Hubert Chathi 5cc5908dd5
Update proposals/1946-secure_server-side_storage.md 
Co-Authored-By: Matthew Hodgson <matthew@arasphere.net>
 2019-11-07 18:45:29 -05:00
Tulir Asokan 30106aaaac Add section about backwards compatibility 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-11-04 21:14:18 +02:00
Hubert Chathi a51805cfe7
Apply suggestions from code review 
Co-Authored-By: Kitsune Ral <Kitsune-Ral@users.sf.net>
 2019-11-01 23:10:14 -04:00
Hubert Chathi 3e42cf528b
Apply suggestions from code review 
Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
 2019-11-01 15:38:14 -04:00
Aaron Raimist 14c32cc4bf Wrap lines 2019-10-30 16:20:17 -05:00
Aaron Raimist 6270983b7f MSC2334 - Change default room version to v5 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-10-30 14:40:52 -05:00
Travis Ralston ce286dac02
Merge pull request #1538 from uhoreg/e2e_backup 
MSC1219: storing megolm keys serverside
 2019-10-29 11:54:44 -06:00
Hubert Chathi a6977f19c5
Update proposals/1219-storing-megolm-keys-serverside.md 
Co-Authored-By: aditsachde <23707194+aditsachde@users.noreply.github.com>
 2019-10-28 12:58:27 -04:00
Hubert Chathi 4fadace9c8
Update proposals/1946-secure_server-side_storage.md 
Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
 2019-10-28 12:48:59 -04:00
Hubert Chathi 86eccc3bc8 change how we mark the default key, and make sure clients trust keys 2019-10-25 15:00:23 -04:00
Hubert Chathi b27f6985b2 more clarifications 2019-10-23 17:32:36 -04:00
Hubert Chathi 9dfca61ae7
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>
Co-Authored-By: Erik Johnston <erikj@jki.re>
 2019-10-23 16:13:17 -04:00
Travis Ralston 7236f1c741
Merge pull request #1983 from matrix-org/travis/msc/leave-reason 
MSC1983: Supporting a reason for leaving rooms
 2019-10-15 11:42:08 +02:00
Hubert Chathi 5799c433fe add HTTP status codes for errors and move key format to the right spot 2019-10-10 15:03:10 -04:00
Hubert Chathi 576177b579 make version optional in versions update 2019-10-09 17:52:53 -04:00
Andrew Morgan 6274a66ae5
Merge pull request #2176 from matrix-org/rav/proposals/update-redaction 
MSC2176: Update the redaction rules
 2019-10-07 10:22:32 +01:00
Travis Ralston f608c48f8a
Merge pull request #2290 from matrix-org/anoa/msc_separate_hs_api 
MSC2290: Separate Endpoints for Threepid Binding
 2019-10-06 09:47:59 -06:00
Matthew Hodgson eddce00390 MSC2313: Ban lists 2019-10-04 21:56:02 -04:00
Hubert Chathi 54e73e4729
Apply suggestions from code review 
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2019-10-04 10:41:28 -04:00
Andrew Morgan 46e7137252 Don't remove id_server and id_access_token 2019-09-26 17:51:51 +01:00
Andrew Morgan ec7e795112 reflow 2019-09-26 17:20:40 +01:00
Andrew Morgan 0332d531e9 Merge branch 'anoa/msc_separate_hs_api' of github.com:matrix-org/matrix-doc into anoa/msc_separate_hs_api 2019-09-26 17:16:49 +01:00
Andrew Morgan 1a51a24768 UIAA on /account/3pid/add 2019-09-26 17:16:44 +01:00
Andrew Morgan 219ebff6d3
typo fix 
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
 2019-09-26 10:37:10 +02:00
Andrew Morgan 9311e89941
Update proposals/2229-rebind-existing-3pid.md 
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
 2019-09-25 01:32:35 +02:00
Brendan Abolivier 6b0a8505ec
Propose case folding instead of lowercasing 2019-09-19 17:34:25 +01:00
Andrew Morgan 40420d9633
Update proposals/2290-separate-threepid-bind-hs.md 
Co-Authored-By: Kitsune Ral <Kitsune-Ral@users.sf.net>
 2019-09-19 11:50:16 +01:00
Andrew Morgan bd64ffc442 Homeservers shouldn't proxy to user-provided identity servers anymore 2019-09-18 11:57:26 +01:00
Richard van der Hoff 5d6113db1e
Update the MSC template (#2296) 
Tradeoffs->Alternatives, and kill the Conclusions section
 2019-09-18 01:39:40 +01:00
Andrew Morgan 87d641c7c1 Describe what the IS and HS are doing in the examples 2019-09-17 17:20:57 +01:00
Andrew Morgan e50bb3df25 Mention that homeserver's should remember binds done through them 2019-09-17 17:04:40 +01:00
Andrew Morgan 53519f98d0 Pin a spec version when we link to it 2019-09-17 17:01:45 +01:00
Andrew Morgan 169174e00b Suggest the use of a unstable flag 2019-09-17 17:01:18 +01:00
Andrew Morgan 1e69a7f3f2 be assertive 2019-09-17 15:02:41 +01:00
Andrew Morgan 3eda9f7b28 Merge branch 'anoa/msc_separate_hs_api' of github.com:matrix-org/matrix-doc into anoa/msc_separate_hs_api 2019-09-17 12:13:01 +01:00
Andrew Morgan 0b67f34578 Address review comments 2019-09-17 12:10:32 +01:00
Andrew Morgan c57250b393
Apply suggestions from code review 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-09-17 11:48:50 +01:00
Andrew Morgan 2a55310754 Clarify why MSC2229 was made obselete 2019-09-17 11:43:56 +01:00
Andrew Morgan af2467606e parameter, not endpoint 2019-09-16 18:01:21 +01:00
Andrew Morgan 4bc005ac84 Remove threepid explanation 2019-09-16 16:27:16 +01:00
Andrew Morgan f06ba491fe Assign meaning to bind and add 2019-09-16 15:49:31 +01:00
Andrew Morgan f36ed9a271 typos 2019-09-16 15:26:07 +01:00
Andrew Morgan 7b656e9013
Update proposals/2290-separate-threepid-bind-hs.md 
Co-Authored-By: Matthew Hodgson <matthew@matrix.org>
 2019-09-16 15:24:43 +01:00
Andrew Morgan 196f27efb2
Update proposals/2290-separate-threepid-bind-hs.md 
Co-Authored-By: Matthew Hodgson <matthew@matrix.org>
 2019-09-16 15:22:05 +01:00
Andrew Morgan 1fc1e3c6ce run on sentence 2019-09-16 14:49:30 +01:00
Andrew Morgan 5b259bfb52 Fix homeserver binding example 2019-09-16 14:47:38 +01:00
Andrew Morgan cb7c072edb Two new endpoints instead of one 2019-09-16 14:42:21 +01:00
Andrew Morgan 5193c319e7 Cleaner API endpoints 2019-09-13 11:49:31 +01:00
Andrew Morgan f5b10c689f cleanup 2019-09-12 15:55:50 +01:00
Andrew Morgan 7096092da9 init 2019-09-12 13:52:52 +01:00
Travis Ralston c00fe02fd1
Merge pull request #1802 from matrix-org/babolivier/standardised-federation-response-format 
MSC1802: Remove the '200' value from some federation responses
 2019-09-10 17:08:02 -06:00
Hubert Chathi 8123c4ef0f additional clarification 2019-09-09 22:57:29 -04:00
Hubert Chathi cf953c47fd clarifications, change "hash" to "etag" 2019-09-09 17:29:32 -04:00
Hubert Chathi 60f0ad5b24 lowercase 2019-09-07 16:05:46 -04:00
Hubert Chathi 7644085274 wording fixes and clarifications 2019-09-07 16:03:11 -04:00
Travis Ralston 6baeb6c218 Assign number 2019-09-05 20:25:31 -06:00
Travis Ralston 738fa6833e Proposal to make the identity server optional during discovery 2019-09-05 20:24:17 -06:00
Brendan Abolivier 48e8c55138 Merge branch 'master' into babolivier/standardised-federation-response-format 2019-09-05 14:54:48 +01:00
Brendan Abolivier 620e5dd74d Merge branch 'babolivier/standardised-federation-response-format' of github.com:matrix-org/matrix-doc into babolivier/standardised-federation-response-format 2019-09-05 14:54:44 +01:00
Brendan Abolivier cb2b71c0be
Remove /send + rename 2019-09-05 14:54:31 +01:00
Brendan Abolivier fc26230007
Update proposals/1802-standardised-federation-response-format.md 
Co-Authored-By: Matthew Hodgson <matthew@matrix.org>
 2019-09-05 14:41:53 +01:00
Travis Ralston 185c564a13 Spec client-server IS unbind API 
As per [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140)

Note: this modifies the endpoint in MSC2140 to be more in line with the remainder of the proposal.
 2019-09-04 16:38:15 -06:00
Travis Ralston 2d784d93ef Merge branch 'master' into travis/spec/is-auth 2019-09-04 16:35:50 -06:00
Travis Ralston 675cabc33d
Merge pull request #2263 from matrix-org/travis/msc/id-server-optional 
MSC2263: Give homeservers the ability to handle their own 3PID registrations/password resets
 2019-09-04 11:11:42 -06:00
Brendan Abolivier 520c76a1cb
Spell out that the proposal also concerns homeservers 2019-09-02 13:56:01 +01:00
Brendan Abolivier 997360995c
Wording 
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2019-09-02 13:41:49 +01:00
Brendan Abolivier bddadfeb18
Typo 
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2019-09-02 13:41:33 +01:00
Brendan Abolivier 552f71a9f9
Wording 
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2019-09-02 13:41:23 +01:00
Brendan Abolivier 524ec52f73
Wording 
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2019-09-02 13:41:07 +01:00
Tulir Asokan b2ce6f87bc Merge branch 'master' into mass_redactions 2019-08-31 21:15:36 +03:00
Tulir Asokan 7ba4564ac3 Remove soft fail auth rule option 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-08-31 21:04:42 +03:00
Matthew Hodgson a805d2b779 oops, premature merge 2019-08-31 16:04:55 +01:00
Matthew Hodgson 6d71a41e22 Proposal for ignoring invites 2019-08-31 16:01:04 +01:00
Tulir Asokan e6f85cacff Specify that "existing auth rules" means room v5 2019-08-31 00:53:08 +03:00
Travis Ralston b36fe24f1b Let's not doubly remove things 2019-08-30 08:27:44 -06:00
Brendan Abolivier 60354f8cf9
MSC number 2019-08-30 14:47:02 +01:00
Brendan Abolivier d1efd488b7
Proposal for mandating lowercasing when processing e-mail address localparts 2019-08-30 14:43:17 +01:00
Travis Ralston f8780e2395 add note about edit 2019-08-30 04:44:39 -06:00
Travis Ralston 1a6eb9a413
Update proposals/2263-homeserver-pw-resets.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-08-29 15:19:12 -06:00
Travis Ralston 6d5e90b1d6
Apply suggestions from code review 
Co-Authored-By: Matthew Hodgson <matthew@matrix.org>
 2019-08-29 14:51:32 -06:00
Travis Ralston 16bb3bd8b5 Add an unstable feature flag to MSC2140 for clients to detect support 2019-08-29 13:59:48 -06:00
Travis Ralston 4e43024039 Assign number 2019-08-29 13:54:53 -06:00
Travis Ralston 1d6501b6ec What if we allowed homeservers to deal with their own business? 2019-08-29 13:51:38 -06:00
Tulir Asokan c909a7c423 Move omitting redacted_because into proposal and add security consideration 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-08-29 21:18:02 +03:00
Travis Ralston ef5d3b9f30 Correct token reference in MSC2140 2019-08-28 15:46:58 -06:00
Tulir Asokan 79a5663ec3 Fix typos, inline links and move image into tree 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-08-28 23:07:34 +03:00
Tulir Asokan 238b78bbaf Add potential issue with redacted_because field 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-08-28 23:07:34 +03:00
Tulir Asokan cd75d0f220 Fix authenticity/authorization terminology 
Co-authored-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-08-28 23:07:12 +03:00
Tulir Asokan 984e0af7b2 Re-word auth rule section on handling each target separately 
Co-authored-by: Jason Volk <jason@zemos.net>
Signed-off-by: Tulir Asokan <tulir@maunium.net>
Signed-off-by: Jason Volk <jason@zemos.net>
 2019-08-28 22:58:59 +03:00
Hubert Chathi 03ae5614b0 remove unnecessary space 2019-08-27 17:56:52 -07:00
Hubert Chathi e1b0042e7b clarifications, minor fixes, formatting 2019-08-27 17:46:45 -07:00
Hubert Chathi 9aade7291a make it agree with what we actually did with key requests 2019-08-27 16:21:00 -07:00
Hubert Chathi cafe49d36d some clarifications 2019-08-27 16:13:18 -07:00
Travis Ralston 356350de91
Merge pull request #2140 from matrix-org/dbkr/tos_2 
MSC2140: Terms of Service for ISes and IMs
 2019-08-26 13:48:45 -06:00
Travis Ralston 7a36016cbb
Merge pull request #2230 from matrix-org/dbkr/is_in_account_data 
MSC2230: Store Identity Server in Account Data
 2019-08-26 08:21:04 -06:00
Travis Ralston 0265817c56
Merge pull request #1957 from matrix-org/travis/msc/integrations/discovery 
MSC1957: Integration manager discovery
 2019-08-25 19:25:46 -06:00
Hubert Chathi 4e2fe124d2 wording fixes/clarifications 2019-08-25 18:22:23 -07:00
Travis Ralston 4ad9bf7059
Merge pull request #1961 from matrix-org/travis/msc/integrations/auth 
MSC1961: Integration manager authentication APIs
 2019-08-23 14:24:09 -06:00
Tulir Asokan ec38013daa Proposal to allow multiple targets for one redaction event 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-08-23 23:07:57 +03:00
Travis Ralston b0f873785d Proposal for room version 6 2019-08-21 18:03:17 -06:00
Travis Ralston b6f0e8e8ed Clarify that the query string is because they are widgets 2019-08-21 17:50:18 -06:00
Travis Ralston 8b85fda52c Add a link to the widget MSC to try and stem questions 2019-08-21 17:47:55 -06:00
David Baker 4ea8f645d6 is_token -> id_access_token and add invite to proxy list 2019-08-21 18:13:50 +01:00
Travis Ralston 8ca50eaf9f
Merge pull request #2010 from Sorunome/soru/spoilers 
MSC2010: Add client-side spoilers
 2019-08-21 08:34:24 -06:00
David Baker 8bd9d7caeb
Add full stop 
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2019-08-21 15:12:45 +01:00
David Baker 69315417b5
Typo 
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2019-08-21 15:12:25 +01:00
David Baker 4073d940da
Typo 
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2019-08-21 15:11:10 +01:00
David Baker 1f8cfd5729 Update migration mechanism 2019-08-21 14:19:20 +01:00
Travis Ralston 53a2ffb12a
Merge pull request #2197 from reivilibre/rei/msc_filter_over_fed 
MSC2197: Search Filtering in Federation /publicRooms
 2019-08-20 15:35:29 -06:00
Travis Ralston 788796e1c6 Multiple clarifications 2019-08-20 09:20:07 -06:00
David Baker 9b2ca3cdfe
typoes / clarifications 
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2019-08-20 16:19:15 +01:00
Travis Ralston 9e073e9647
Speeeeeeling 
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2019-08-19 10:42:30 -06:00
Andrew Morgan 997c5466a8
MSC2229: Allowing 3PID Owners to Rebind (#2229) 2019-08-19 13:35:02 +01:00
David Baker 6d0067320c clarify error proxying 2019-08-19 13:31:44 +01:00
David Baker 12377fbf50
/account/logout not /logout 
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
 2019-08-19 11:53:41 +01:00
David Baker e4bdc283fd
Apply suggestions from code review 
Typos / spelling

Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
 2019-08-19 11:45:46 +01:00
Olivier Wilkinson (reivilibre) 76f9196ff3 Address @richvdh's comments 2019-08-19 07:44:37 +01:00
Travis Ralston 865d3da0f8 General clarity improvements 2019-08-16 19:59:32 -06:00
Travis Ralston 22c9692684 Disclose origin story better 2019-08-16 19:53:28 -06:00
Travis Ralston 475c64de8c Disclose origin story 2019-08-16 19:52:35 -06:00
Andrew Morgan 4059661c29
Update proposals/2229-rebind-existing-3pid.md 
Co-Authored-By: Kitsune Ral <Kitsune-Ral@users.sf.net>
 2019-08-14 11:38:53 +01:00
Olivier Wilkinson (reivilibre) 4219e272ec Drop the hard SHOULD 
Adopts @turt2live's phrasing

Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-14 11:06:45 +01:00
Olivier Wilkinson (reivilibre) 7e85b9d56a Acknowledge other potential error responses for fallback 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-14 11:03:55 +01:00
Olivier Wilkinson (reivilibre) 97f856d706 Domain name is potentially personally-identifying 
Thanks to @turt2live

Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-14 11:00:03 +01:00
David Baker b9b984ae60 clarify 2019-08-14 09:52:13 +01:00
David Baker 229cb67b01
Apply suggestions from code review 
Use fewer formal MUST etc in proposal

Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-08-14 09:51:27 +01:00
Andrew Morgan 7758e0701c Remove homeserver warning 2019-08-13 18:22:06 +01:00
David Baker 2c8d112089 assign number 2019-08-13 18:03:43 +01:00
Andrew Morgan 2e2a74a235 Merge branch 'anoa/rebind_3pids' of github.com:matrix-org/matrix-doc into anoa/rebind_3pids 2019-08-13 17:17:11 +01:00
Andrew Morgan 2547cc443c backticks 2019-08-13 17:17:06 +01:00
Andrew Morgan 01fc54faae
Update proposals/2229-rebind-existing-3pid.md 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-08-13 17:15:48 +01:00
Andrew Morgan 5b1ea4ffcb
Update proposals/2229-rebind-existing-3pid.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-08-13 17:13:48 +01:00
Andrew Morgan cb1e3b8373 Take into account the 1 is case 2019-08-13 13:29:35 +01:00
Andrew Morgan f313b49c26 Add bind def. 2019-08-13 11:40:34 +01:00
Andrew Morgan be77b5823c fix up 2019-08-13 11:24:37 +01:00