diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-09-06 11:35:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-06 11:35:28 +0100 |
| commit | 0c0b82b6d18102694f9ff1c40b94e5dd124c21d8 (patch) | |
| tree | 77beb2c741e5c156462abbe5b979d9f25d743310 /contrib/cmdclient/console.py | |
| parent | Trace how long it takes for the send trasaction to complete, including retrys... (diff) | |
| download | synapse-0c0b82b6d18102694f9ff1c40b94e5dd124c21d8.tar.xz | |
Allow Synapse to send registration emails + choose Synapse or an external server to handle 3pid validation (#5987)
This is a combination of a few different PRs, finally all being merged into `develop`: * #5875 * #5876 * #5868 (This one added the `/versions` flag but the flag itself was actually [backed out](https://github.com/matrix-org/synapse/commit/891afb57cbdf9867f2848341b29c75d6f35eef5a#diff-e591d42d30690ffb79f63bb726200891) in #5969. What's left is just giving /versions access to the config file, which could be useful in the future) * #5835 * #5969 * #5940 Clients should not actually use the new registration functionality until https://github.com/matrix-org/synapse/pull/5972 is merged. UPGRADE.rst, changelog entries and config file changes should all be reviewed closely before this PR is merged.
Diffstat (limited to 'contrib/cmdclient/console.py')
| -rwxr-xr-x | contrib/cmdclient/console.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/cmdclient/console.py b/contrib/cmdclient/console.py index 899c650b0c..48da410d94 100755 --- a/contrib/cmdclient/console.py +++ b/contrib/cmdclient/console.py @@ -37,6 +37,8 @@ from signedjson.sign import verify_signed_json, SignatureVerifyException CONFIG_JSON = "cmdclient_config.json" +# TODO: The concept of trusted identity servers has been deprecated. This option and checks +# should be removed TRUSTED_ID_SERVERS = ["localhost:8001"] |