0
0
Fork 0
Commit Graph

4768 Commits

Author SHA1 Message Date
Hubert Chathi cf953c47fd clarifications, change "hash" to "etag" 2019-09-09 17:29:32 -04:00
Hubert Chathi 60f0ad5b24 lowercase 2019-09-07 16:05:46 -04:00
Hubert Chathi 7644085274 wording fixes and clarifications 2019-09-07 16:03:11 -04: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 6baeb6c218 Assign number 2019-09-05 20:25:31 -06:00
Travis Ralston 738fa6833e Proposal to make the identity server optional during discovery 2019-09-05 20:24:17 -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
Tulir Asokan b2ce6f87bc Merge branch 'master' into mass_redactions 2019-08-31 21:15:36 +03:00
Tulir Asokan 7ba4564ac3 Remove soft fail auth rule option
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-08-31 21:04:42 +03: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
Tulir Asokan e6f85cacff Specify that "existing auth rules" means room v5 2019-08-31 00:53:08 +03: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