summary refs log tree commit diff
path: root/synapse/res/templates/terms.html
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-10-02 12:59:17 +0100
committerRichard van der Hoff <richard@matrix.org>2020-10-02 12:59:17 +0100
commit462e681c792e2fce6769ef80d11045da11fb0842 (patch)
tree72c2acacc8ec9e3c1220e5d4151daae2436482eb /synapse/res/templates/terms.html
parentInclude a public_baseurl in configs generated by the demo script. (#8443) (diff)
parentmove #8444 to 'feature' (diff)
downloadsynapse-462e681c792e2fce6769ef80d11045da11fb0842.tar.xz
Merge tag 'v1.21.0rc2' into develop
Synapse 1.21.0rc2 (2020-10-02)
==============================

Features
--------

- Convert additional templates from inline HTML to Jinja2 templates. ([\#8444](https://github.com/matrix-org/synapse/issues/8444))

Bugfixes
--------

- Fix a regression in v1.21.0rc1 which broke thumbnails of remote media. ([\#8438](https://github.com/matrix-org/synapse/issues/8438))
- Do not expose the experimental `uk.half-shot.msc2778.login.application_service` flow in the login API, which caused a compatibility problem with Element iOS. ([\#8440](https://github.com/matrix-org/synapse/issues/8440))
- Fix malformed log line in new federation "catch up" logic. ([\#8442](https://github.com/matrix-org/synapse/issues/8442))
- Fix DB query on startup for negative streams which caused long start up times. Introduced in [\#8374](https://github.com/matrix-org/synapse/issues/8374). ([\#8447](https://github.com/matrix-org/synapse/issues/8447))
Diffstat (limited to 'synapse/res/templates/terms.html')
-rw-r--r--synapse/res/templates/terms.html20
1 files changed, 20 insertions, 0 deletions
diff --git a/synapse/res/templates/terms.html b/synapse/res/templates/terms.html
new file mode 100644
index 0000000000..dfef9897ee
--- /dev/null
+++ b/synapse/res/templates/terms.html
@@ -0,0 +1,20 @@
+<html>
+<head>
+<title>Authentication</title>
+<meta name='viewport' content='width=device-width, initial-scale=1,
+    user-scalable=no, minimum-scale=1.0, maximum-scale=1.0'>
+<link rel="stylesheet" href="/_matrix/static/client/register/style.css">
+</head>
+<body>
+<form id="registrationForm" method="post" action="{{ myurl }}">
+    <div>
+        <p>
+            Please click the button below if you agree to the
+            <a href="{{ terms_url }}">privacy policy of this homeserver.</a>
+        </p>
+        <input type="hidden" name="session" value="{{ session }}" />
+        <input type="submit" value="Agree" />
+    </div>
+</form>
+</body>
+</html>