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

4515 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston 358c49ff6e Merge branch 'travis/spec/is-auth' into travis/spec/is-unbind 2019-09-04 16:38:12 -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
Travis Ralston a7c3c295b8
Merge pull request #2264 from matrix-org/travis/msc/feature-flag-2140 
MSC2264: Add an unstable feature flag to MSC2140 for clients to detect support
 2019-09-04 11:09:53 -06:00
Travis Ralston b8971f46ab
Merge pull request #2280 from Cadair/giles2 
Update to the new deployment of Giles
 2019-09-04 07:14:10 -06:00
Stuart Mumford 9574f3c8d0
update to the new deployment of Giles 
Signed-off-by: Stuart Mumford <stuart@cadair.com>
 2019-09-04 14:12:38 +01:00
Travis Ralston 5a434ea7ac
Merge pull request #2279 from matrix-org/travis/spec/is-no-bind 
Remove bind_* params on /register as per MSC2140
 2019-09-04 05:31:34 -06:00
Travis Ralston 001c51a740 /3pid/delete and /deactivate don't take an id_access_token 2019-09-03 15:09:59 -06:00
Travis Ralston caf46db6e7 Changelog 2019-09-03 15:04:58 -06:00
Travis Ralston 52e6868f50 Remove bind_* params on /register as per MSC2140 
See https://github.com/matrix-org/matrix-doc/pull/2140
See https://github.com/matrix-org/matrix-doc/issues/2253
 2019-09-03 15:03:41 -06:00
Travis Ralston 8f48b4e717 Merge branch 'master' into travis/spec/is-auth 2019-09-03 14:03:34 -06:00
Travis Ralston 2b8c8ad512 MSC1779 is actually merged now 2019-09-03 13:49:25 -06:00
Ben Parsons d346099cf7 deduplicate MSC1779 ref in proposals list 2019-09-03 18:30:05 +01:00
Matthew Hodgson 1f2acbcf29 RST is not MD 2019-08-31 16:45:53 +01: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
Travis Ralston c9fcf9021c
Merge pull request #2266 from matrix-org/travis/fix-ci 
Fix CI by bumping golang version
 2019-08-30 10:16:43 -06:00
Travis Ralston 5acac5a44e Try bumping golang version 2019-08-30 09:12:02 -06:00
Travis Ralston b36fe24f1b Let's not doubly remove things 2019-08-30 08:27:44 -06:00
Richard van der Hoff 62cc11eee6 add missing github-labels file 2019-08-30 13:50:00 +01:00
Travis Ralston 9f41ae50b1 let's try and fix the CI 2019-08-30 04:47:37 -06: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
Travis Ralston 91f862d9e8 Use the right error code for 401 errors 2019-08-28 20:57:07 -06:00
Travis Ralston fad9974383 Add missed changelog from prior PR 2019-08-28 15:47:08 -06:00
Travis Ralston aa98137514 Add changelog 2019-08-28 15:47:08 -06:00
Travis Ralston 0408373cf9 Litter the client-server API with id_access_token 2019-08-28 15:47:08 -06:00
Travis Ralston 4d0ea64121 Define authentication, ripping off the client-server API description 2019-08-28 15:46:58 -06:00
Travis Ralston e40d9e296d Split OpenID token info out verbatim 2019-08-28 15:46:58 -06:00
Travis Ralston ef5d3b9f30 Correct token reference in MSC2140 2019-08-28 15:46:58 -06:00
Travis Ralston 03641d9e48
Merge pull request #2254 from matrix-org/travis/spec/is-v2 
Deprecate the v1 IS API and replace most of it with v2
 2019-08-28 15:01:28 -06:00
Travis Ralston ca4d9d8636 Deprecate the v1 IS API 2019-08-28 14:19:13 -06:00
Travis Ralston b0acaeddfa Reference the v2 API where possible 2019-08-28 14:18:11 -06:00
Travis Ralston a47c5aeb42 v2-ify the v2 api 
Note that ping and pubkey doesn't require auth - see MSC2140 for more information.
 2019-08-28 14:17:51 -06:00
Travis Ralston 5b53b3d0b8 Clone v1 APIs verbatim 2019-08-28 14:01:36 -06:00
Travis Ralston b8a3f970ee Add security definition for access token 2019-08-28 13:40:48 -06:00
Travis Ralston b5529ff6a3
Merge pull request #2250 from matrix-org/travis/deprecated-toc 
List deprecated endpoints as deprecated
 2019-08-28 07:49:31 -06:00
Travis Ralston de3802cd5c List deprecated endpoints as deprecated 
Affects the title and the table of contents. We can't realistically alter just the table of contents, but the table of contents is generated from this header.

Fixes https://github.com/matrix-org/matrix-doc/issues/1800
 2019-08-27 19:24:13 -06: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 808eda404a
Merge pull request #2247 from matrix-org/poljar/key_request_fix 
Fix the action of a room key request cancellation.
 2019-08-26 09:46:57 -06:00
Damir Jelić 35eb1993d9 Add a changelog fragment for the room key request action fix. 2019-08-26 17:40:32 +02: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
Damir Jelić a96a2f3fce Fix the action of a room key request cancellation. 
The spec states that the action of a room key request cancellation
should be "cancel_request" but every known implementation uses
"request_cancellation" instead.

This patch fixes the spec to reflect the implementations.
 2019-08-26 12:21:23 +02: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
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
Travis Ralston b6f0e8e8ed Clarify that the query string is because they are widgets 2019-08-21 17:50:18 -06:00