Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_are_numbers

58 files changed, 29 insertions, 30 deletions

diff --git a/changelog.d/3698.misc b/changelog.d/3698.misc
deleted file mode 100644
index 12537e76f2..0000000000
--- a/changelog.d/3698.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add information about the [matrix-docker-ansible-deploy](https://github.com/spantaleev/matrix-docker-ansible-deploy) playbook
diff --git a/changelog.d/3778.misc b/changelog.d/3778.misc
new file mode 100644
index 0000000000..b78a2c9f42
--- /dev/null
+++ b/changelog.d/3778.misc
@@ -0,0 +1 @@
+Fix build of Docker image with docker-compose
diff --git a/changelog.d/3786.misc b/changelog.d/3786.misc
deleted file mode 100644
index a9f9a2bb27..0000000000
--- a/changelog.d/3786.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add initial implementation of new state resolution algorithm
diff --git a/changelog.d/3969.bugfix b/changelog.d/3969.bugfix
deleted file mode 100644
index ca2759e91e..0000000000
--- a/changelog.d/3969.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix HTTP error response codes for federated group requests.
diff --git a/changelog.d/3975.feature b/changelog.d/3975.feature
deleted file mode 100644
index 162f30a532..0000000000
--- a/changelog.d/3975.feature
+++ /dev/null
@@ -1 +0,0 @@
-Servers with auto-join rooms will now automatically create those rooms when the first user registers
diff --git a/changelog.d/4004.feature b/changelog.d/4004.feature
new file mode 100644
index 0000000000..89975f4c6e
--- /dev/null
+++ b/changelog.d/4004.feature
@@ -0,0 +1 @@
+Include flags to optionally add `m.login.terms` to the registration flow when consent tracking is enabled.
diff --git a/changelog.d/4006.misc b/changelog.d/4006.misc
new file mode 100644
index 0000000000..35ffa1c2d2
--- /dev/null
+++ b/changelog.d/4006.misc
@@ -0,0 +1 @@
+Delete unreferenced state groups during history purge
diff --git a/changelog.d/4011.misc b/changelog.d/4011.misc
deleted file mode 100644
index ad7768c4cd..0000000000
--- a/changelog.d/4011.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce database load when fetching state groups
diff --git a/changelog.d/4031.misc b/changelog.d/4031.misc
deleted file mode 100644
index 60be8b59fd..0000000000
--- a/changelog.d/4031.misc
+++ /dev/null
@@ -1 +0,0 @@
-Various cleanups in the federation client code
diff --git a/changelog.d/4041.misc b/changelog.d/4041.misc
deleted file mode 100644
index 8cce9daac9..0000000000
--- a/changelog.d/4041.misc
+++ /dev/null
@@ -1 +0,0 @@
-Run the CircleCI builds in docker containers
diff --git a/changelog.d/4046.bugfix b/changelog.d/4046.bugfix
deleted file mode 100644
index 5046dd1ce3..0000000000
--- a/changelog.d/4046.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue where Python 3 users couldn't paginate /publicRooms
diff --git a/changelog.d/4049.misc b/changelog.d/4049.misc
deleted file mode 100644
index 4370d9dfa6..0000000000
--- a/changelog.d/4049.misc
+++ /dev/null
@@ -1 +0,0 @@
-Only colourise synctl output when attached to tty
diff --git a/changelog.d/4050.bugfix b/changelog.d/4050.bugfix
deleted file mode 100644
index 3d1f6af847..0000000000
--- a/changelog.d/4050.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix URL priewing to work in Python 3.7
diff --git a/changelog.d/4051.feature b/changelog.d/4051.feature
deleted file mode 100644
index 9c1b3a72a0..0000000000
--- a/changelog.d/4051.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add config option to control alias creation
diff --git a/changelog.d/4057.bugfix b/changelog.d/4057.bugfix
deleted file mode 100644
index 7577731255..0000000000
--- a/changelog.d/4057.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-synctl will use the right python executable to run worker processes
\ No newline at end of file
diff --git a/changelog.d/4060.bugfix b/changelog.d/4060.bugfix
deleted file mode 100644
index 78d69a8819..0000000000
--- a/changelog.d/4060.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Manhole now works again on Python 3, instead of failing with a "couldn't match all kex parts" when connecting.
diff --git a/changelog.d/4061.bugfix b/changelog.d/4061.bugfix
deleted file mode 100644
index 94ffcf7a51..0000000000
--- a/changelog.d/4061.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix some metrics being racy and causing exceptions when polled by Prometheus.
diff --git a/changelog.d/4063.misc b/changelog.d/4063.misc
deleted file mode 100644
index 677fcb90ad..0000000000
--- a/changelog.d/4063.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor room alias creation code
diff --git a/changelog.d/4067.bugfix b/changelog.d/4067.bugfix
deleted file mode 100644
index 78d69a8819..0000000000
--- a/changelog.d/4067.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Manhole now works again on Python 3, instead of failing with a "couldn't match all kex parts" when connecting.
diff --git a/changelog.d/4068.bugfix b/changelog.d/4068.bugfix
deleted file mode 100644
index 74bda7491f..0000000000
--- a/changelog.d/4068.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug which prevented email notifications from being sent unless an absolute path was given for `email_templates`.
\ No newline at end of file
diff --git a/changelog.d/4068.misc b/changelog.d/4068.misc
deleted file mode 100644
index db6c4ade59..0000000000
--- a/changelog.d/4068.misc
+++ /dev/null
@@ -1 +0,0 @@
-Make the Python scripts in the top-level scripts folders meet pep8 and pass flake8.
diff --git a/changelog.d/4072.misc b/changelog.d/4072.misc
deleted file mode 100644
index 9d7279fd2b..0000000000
--- a/changelog.d/4072.misc
+++ /dev/null
@@ -1 +0,0 @@
-The README now contains example for the Caddy web server. Contributed by steamp0rt.
diff --git a/changelog.d/4073.misc b/changelog.d/4073.misc
deleted file mode 100644
index fc304bef06..0000000000
--- a/changelog.d/4073.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add psutil as an explicit dependency
diff --git a/changelog.d/4074.bugfix b/changelog.d/4074.bugfix
deleted file mode 100644
index b3b6b00243..0000000000
--- a/changelog.d/4074.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Correctly account for cpu usage by background threads
diff --git a/changelog.d/4075.misc b/changelog.d/4075.misc
deleted file mode 100644
index d08b8cc271..0000000000
--- a/changelog.d/4075.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up threading and logcontexts in pushers
\ No newline at end of file
diff --git a/changelog.d/4076.misc b/changelog.d/4076.misc
deleted file mode 100644
index 9dd000decf..0000000000
--- a/changelog.d/4076.misc
+++ /dev/null
@@ -1 +0,0 @@
-Correctly manage logcontexts during startup to fix some "Unexpected logging context" warnings
\ No newline at end of file
diff --git a/changelog.d/4077.misc b/changelog.d/4077.misc
deleted file mode 100644
index 52ca4c1de2..0000000000
--- a/changelog.d/4077.misc
+++ /dev/null
@@ -1 +0,0 @@
-Give some more things logcontexts
diff --git a/changelog.d/4081.bugfix b/changelog.d/4081.bugfix
deleted file mode 100644
index cfe4b3e9d9..0000000000
--- a/changelog.d/4081.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix race condition where config defined reserved users were not being added to
-the monthly active user list prior to the homeserver reactor firing up
diff --git a/changelog.d/4082.misc b/changelog.d/4082.misc
deleted file mode 100644
index a81faf5e9b..0000000000
--- a/changelog.d/4082.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up some bits of code which were flagged by the linter
diff --git a/changelog.d/4083.bugfix b/changelog.d/4083.bugfix
deleted file mode 100644
index b3b08cdfa6..0000000000
--- a/changelog.d/4083.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug which prevented backslashes being used in event field filters
\ No newline at end of file
diff --git a/changelog.d/4085.feature b/changelog.d/4085.feature
deleted file mode 100644
index 4bd3ddcf2c..0000000000
--- a/changelog.d/4085.feature
+++ /dev/null
@@ -1 +0,0 @@
-The register_new_matrix_user script is now ported to Python 3.
diff --git a/changelog.d/4089.feature b/changelog.d/4089.feature
deleted file mode 100644
index 62c9d839bb..0000000000
--- a/changelog.d/4089.feature
+++ /dev/null
@@ -1 +0,0 @@
- Configure Docker image to listen on both ipv4 and ipv6.
diff --git a/changelog.d/4095.bugfix b/changelog.d/4095.bugfix
new file mode 100644
index 0000000000..76ee7148c2
--- /dev/null
+++ b/changelog.d/4095.bugfix
@@ -0,0 +1 @@
+Fix exceptions when using the email mailer on Python 3.
diff --git a/changelog.d/4101.feature b/changelog.d/4101.feature
new file mode 100644
index 0000000000..a3f7dbdcdd
--- /dev/null
+++ b/changelog.d/4101.feature
@@ -0,0 +1 @@
+Support for replacing rooms with new ones
diff --git a/changelog.d/4118.removal b/changelog.d/4118.removal
new file mode 100644
index 0000000000..6fb1d67b47
--- /dev/null
+++ b/changelog.d/4118.removal
@@ -0,0 +1 @@
+The obsolete and non-functional /pull federation endpoint has been removed.
diff --git a/changelog.d/4119.removal b/changelog.d/4119.removal
new file mode 100644
index 0000000000..81383ece6b
--- /dev/null
+++ b/changelog.d/4119.removal
@@ -0,0 +1 @@
+The deprecated v1 key exchange endpoints have been removed.
diff --git a/changelog.d/4120.removal b/changelog.d/4120.removal
new file mode 100644
index 0000000000..a7a567098f
--- /dev/null
+++ b/changelog.d/4120.removal
@@ -0,0 +1 @@
+Synapse will no longer fetch keys using the fallback deprecated v1 key exchange method and will now always use v2.
diff --git a/changelog.d/4121.misc b/changelog.d/4121.misc
new file mode 100644
index 0000000000..9c29d80c3f
--- /dev/null
+++ b/changelog.d/4121.misc
@@ -0,0 +1 @@
+Log some bits about room creation
diff --git a/changelog.d/4122.bugfix b/changelog.d/4122.bugfix
new file mode 100644
index 0000000000..66dcfb18b9
--- /dev/null
+++ b/changelog.d/4122.bugfix
@@ -0,0 +1 @@
+Searches that request profile info now no longer fail with a 500.
diff --git a/changelog.d/4123.bugfix b/changelog.d/4123.bugfix
new file mode 100644
index 0000000000..b82bc2aad3
--- /dev/null
+++ b/changelog.d/4123.bugfix
@@ -0,0 +1 @@
+fix return code of empty key backups
diff --git a/changelog.d/4124.misc b/changelog.d/4124.misc
new file mode 100644
index 0000000000..28f438b9b2
--- /dev/null
+++ b/changelog.d/4124.misc
@@ -0,0 +1 @@
+Fix `tox` failure on old systems
diff --git a/changelog.d/4127.bugfix b/changelog.d/4127.bugfix
new file mode 100644
index 0000000000..0701d2ceaa
--- /dev/null
+++ b/changelog.d/4127.bugfix
@@ -0,0 +1 @@
+If the typing stream ID goes backwards (as on a worker when the master restarts), the worker's typing handler will no longer erroneously report rooms containing new typing events.
diff --git a/changelog.d/4128.misc b/changelog.d/4128.misc
new file mode 100644
index 0000000000..76ab4b085c
--- /dev/null
+++ b/changelog.d/4128.misc
@@ -0,0 +1 @@
+Add STATE_V2_TEST room version
diff --git a/changelog.d/4132.bugfix b/changelog.d/4132.bugfix
new file mode 100644
index 0000000000..2304a40f05
--- /dev/null
+++ b/changelog.d/4132.bugfix
@@ -0,0 +1 @@
+Fix table lock of device_lists_remote_cache which could freeze the application
\ No newline at end of file
diff --git a/changelog.d/4133.feature b/changelog.d/4133.feature
new file mode 100644
index 0000000000..89975f4c6e
--- /dev/null
+++ b/changelog.d/4133.feature
@@ -0,0 +1 @@
+Include flags to optionally add `m.login.terms` to the registration flow when consent tracking is enabled.
diff --git a/changelog.d/4135.bugfix b/changelog.d/4135.bugfix
new file mode 100644
index 0000000000..6879b1c162
--- /dev/null
+++ b/changelog.d/4135.bugfix
@@ -0,0 +1 @@
+Fix exception when using state res v2 algorithm
diff --git a/changelog.d/4137.misc b/changelog.d/4137.misc
new file mode 100644
index 0000000000..4fe933e33c
--- /dev/null
+++ b/changelog.d/4137.misc
@@ -0,0 +1 @@
+Clean up event accesses and tests
diff --git a/changelog.d/4138.misc b/changelog.d/4138.misc
new file mode 100644
index 0000000000..300199f8e8
--- /dev/null
+++ b/changelog.d/4138.misc
@@ -0,0 +1 @@
+The default logging config will now set an explicit log file encoding of UTF-8.
diff --git a/changelog.d/4139.misc b/changelog.d/4139.misc
new file mode 100644
index 0000000000..d63d9e7003
--- /dev/null
+++ b/changelog.d/4139.misc
@@ -0,0 +1 @@
+Add helpers functions for getting prev and auth events of an event
diff --git a/changelog.d/4140.bugfix b/changelog.d/4140.bugfix
new file mode 100644
index 0000000000..c7e0ee229d
--- /dev/null
+++ b/changelog.d/4140.bugfix
@@ -0,0 +1 @@
+Generating the user consent URI no longer fails on Python 3.
diff --git a/changelog.d/4142.feature b/changelog.d/4142.feature
new file mode 100644
index 0000000000..89975f4c6e
--- /dev/null
+++ b/changelog.d/4142.feature
@@ -0,0 +1 @@
+Include flags to optionally add `m.login.terms` to the registration flow when consent tracking is enabled.
diff --git a/changelog.d/4149.misc b/changelog.d/4149.misc
new file mode 100644
index 0000000000..0b299f0c6e
--- /dev/null
+++ b/changelog.d/4149.misc
@@ -0,0 +1 @@
+Add some tests for the HTTP pusher.
diff --git a/changelog.d/4155.misc b/changelog.d/4155.misc
new file mode 100644
index 0000000000..4a7d5acb66
--- /dev/null
+++ b/changelog.d/4155.misc
@@ -0,0 +1 @@
+add purge_history.sh and purge_remote_media.sh scripts to contrib/
diff --git a/changelog.d/4156.misc b/changelog.d/4156.misc
new file mode 100644
index 0000000000..20d404406c
--- /dev/null
+++ b/changelog.d/4156.misc
@@ -0,0 +1 @@
+HTTP tests have been refactored to contain less boilerplate.
diff --git a/changelog.d/4157.bugfix b/changelog.d/4157.bugfix
new file mode 100644
index 0000000000..265514c3af
--- /dev/null
+++ b/changelog.d/4157.bugfix
@@ -0,0 +1 @@
+Loading URL previews from the DB cache on Postgres will no longer cause Unicode type errors when responding to the request, and URL previews will no longer fail if the remote server returns a Content-Type header with the chartype in quotes.
\ No newline at end of file
diff --git a/changelog.d/4161.bugfix b/changelog.d/4161.bugfix
new file mode 100644
index 0000000000..252a40376b
--- /dev/null
+++ b/changelog.d/4161.bugfix
@@ -0,0 +1 @@
+The hash_password script now works on Python 3.
diff --git a/changelog.d/4163.bugfix b/changelog.d/4163.bugfix
new file mode 100644
index 0000000000..c7e0ee229d
--- /dev/null
+++ b/changelog.d/4163.bugfix
@@ -0,0 +1 @@
+Generating the user consent URI no longer fails on Python 3.
diff --git a/changelog.d/4164.bugfix b/changelog.d/4164.bugfix
new file mode 100644
index 0000000000..f70e0b2056
--- /dev/null
+++ b/changelog.d/4164.bugfix
@@ -0,0 +1 @@
+Fix noop checks when updating device keys, reducing spurious device list update notifications.