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

567 commits

Author SHA1 Message Date
Hubert Chathi 5742c30a96 s/accept/ready/ because we already have an m.key.verification.accept 2019-11-29 09:22:09 -05:00
Hubert Chathi 5f5f99fcc1 wording tweaks 2019-11-26 13:06:13 -05:00
Hubert Chathi abbba4788c rename to match MSC number 2019-11-25 16:16:34 -05:00
Hubert Chathi 33df2d1414 initial proposal of m.key.verification.accept 2019-11-25 16:14:49 -05: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
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
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
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
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