Commit graph

4640 commits

Author SHA1 Message Date
Travis Ralston
f281ac69cd
Merge pull request #2328 from matrix-org/travis/spec/2290-new-bind
Spec MSC2290: 3PID binding split
2019-10-29 15:56:37 -06: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
Travis Ralston
2bca44a2e5 Remove extraneous backwards compatibility note 2019-10-28 14:28:48 -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
f5f12a29e0 Spec MSC2290: 3PID binding split 2019-10-23 19:24:11 -06: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
Travis Ralston
156fbfb4c7
Merge pull request #2311 from matrix-org/travis/fix-changelog-again
Fix client-server typos changelog
2019-10-07 17:39:26 +01: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
Travis Ralston
3d60e04c6a
Merge pull request #2310 from matrix-org/travis/spec/2263-deprecate-id-server
Deprecate id_server and make it optional
2019-10-04 16:19:53 -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
Travis Ralston
500db6fa2c
Merge pull request #2245 from quotient-im/kitsune-map-to-enum-support
Render enums inside additionalProps as one more table
2019-10-03 17:21:06 -06:00
Travis Ralston
b59998fd2b Fix client-server typos changelog
Note: .misc is not a valid changelog entry.
2019-10-03 09:49:01 -06:00
Travis Ralston
2e84465c13 Changelog 2019-10-03 09:42:59 -06:00
Travis Ralston
48b8a95df6 Deprecate id_server and make it optional
As per [MSC2263](https://github.com/matrix-org/matrix-doc/pull/2263)
2019-10-03 09:41:45 -06:00
Kitsune Ral
6b37bb1dd9 Merge remote-tracking branch 'remotes/origin/master' into kitsune-map-to-enum-support 2019-10-03 11:06:27 +09:00
Kitsune Ral
79f16d40a9
Add a full stop
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-10-03 08:28:05 +09: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
Travis Ralston
1a8fbfedc9
Merge pull request #2305 from matrix-org/travis/spec/ss-search
Add s2s POST /publicRooms per MSC2197
2019-09-25 06:39:14 -06:00
Travis Ralston
6d60b0458a
Merge pull request #2304 from matrix-org/travis/fix-ref
Point to the new v2 identity endpoint
2019-09-25 06:38:56 -06: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
Travis Ralston
5cb7599196 Changelog 2019-09-24 13:39:33 -06:00
Travis Ralston
8d865ca53a Add s2s POST /publicRooms per MSC2197
See https://github.com/matrix-org/matrix-doc/pull/2197
2019-09-24 13:36:51 -06:00
Travis Ralston
eebcaaef02 Point to the new v2 identity endpoint 2019-09-24 13:30:24 -06: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
Travis Ralston
2c88f02daa
Merge pull request #2287 from matrix-org/travis/spec/lookup-v2
Spec the v2 lookup API
2019-09-16 08:45:11 -06: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