Commit graph

4553 commits

Author SHA1 Message Date
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
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
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
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
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
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
Travis Ralston
7a391bf938
Merge pull request #2282 from matrix-org/travis/spec/is-unbind
Spec client-server IS unbind API
2019-09-10 10:52:31 -06:00
Travis Ralston
d813b8e12c Mention M_INVALID_PARAM 2019-09-10 09:35:37 -06:00
Travis Ralston
b3e2326d8b changelog 2019-09-09 19:59:18 -06:00
Travis Ralston
6cfd761204 Spec the v2 lookup API
Spec for [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134)
2019-09-09 19:58:06 -06:00
Travis Ralston
642be6c677 Fix unbind wording 2019-09-06 13:06:16 -06:00
Travis Ralston
30a9de7e02 Merge branch 'master' into travis/spec/is-unbind 2019-09-06 13:05:19 -06:00
Travis Ralston
a24bcc2c0a
Merge pull request #2258 from matrix-org/travis/spec/is-terms
Spec IS terms of service
2019-09-06 10:29:47 -06:00
Travis Ralston
f7e00b19e9
Merge pull request #2255 from matrix-org/travis/spec/is-auth
Spec the v2 IS auth APIs
2019-09-06 10:29:08 -06:00
Travis Ralston
54fb5eb5cf
Merge pull request #2281 from matrix-org/travis/spec/identity-server-storage
Spec m.identity_server account data
2019-09-06 10:28:09 -06:00
Travis Ralston
1881a255c2 Clarify that id_access_token is optional for r0.5 2019-09-05 13:53:58 -06:00
Travis Ralston
6488c79cc3
Merge pull request #2283 from cvarley100/patch-1
Minor typo in index.rst
2019-09-05 08:43:11 -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
Charlie Varley
4d835c1753
Update index.rst 2019-09-05 10:31:44 +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
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
6ec7d4cd89 changelog 2019-09-04 16:20:14 -06:00
Travis Ralston
958cffd330 Spec m.identity_server account data
As per [MSC2230](https://github.com/matrix-org/matrix-doc/pull/2230)
2019-09-04 16:17:41 -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
afd5018494 Spec the terms of service handling for identity servers
Part of MSC2140

Convert status codes to strings if there is a string status code. Fixes a build error when we mix 4xx and 403 in the same definition. We also have to correct stringified numbers to pass the build.
2019-09-03 14:04:05 -06:00
Travis Ralston
b7e84cf4ce Merge branch 'travis/spec/is-auth' into travis/spec/is-terms 2019-09-03 14:04:01 -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