diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-25 11:36:21 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-25 11:36:21 +0000 |
| commit | df5db3f29324861c579ea56cdd743f1d3f949f64 (patch) | |
| tree | 919f0274f9fbba1dc50ecbf2e118bbcada0d9cce | |
| parent | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcs (diff) | |
| parent | Merge pull request #5994 from matrix-org/anoa/html_template_fix (diff) | |
| download | synapse-df5db3f29324861c579ea56cdd743f1d3f949f64.tar.xz | |
Merge pull request #5994 from matrix-org/anoa/html_template_fix
| -rw-r--r-- | changelog.d/5994.feature | 1 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/5994.feature b/changelog.d/5994.feature new file mode 100644 index 0000000000..5b69b97fe7 --- /dev/null +++ b/changelog.d/5994.feature @@ -0,0 +1 @@ +Add the ability to send registration emails from the homeserver rather than delegating to an identity server. \ No newline at end of file diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index 628cf8035b..9b5ae1d805 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -271,7 +271,7 @@ class PasswordResetSubmitTokenServlet(RestServlet): request.setResponseCode(e.code) # Show a failure page with a reason - html_template = load_jinja2_templates( + html_template, = load_jinja2_templates( self.config.email_template_dir, [self.config.email_password_reset_template_failure_html], ) diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index 83d0c64a33..c48cf017a3 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -298,7 +298,7 @@ class RegistrationSubmitTokenServlet(RestServlet): request.setResponseCode(e.code) # Show a failure page with a reason - html_template = load_jinja2_templates( + html_template, = load_jinja2_templates( self.config.email_template_dir, [self.config.email_registration_template_failure_html], ) |