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

4497 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Richard van der Hoff 62cc11eee6 add missing github-labels file 2019-08-30 13:50:00 +01: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
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