summary refs log tree commit diff
path: root/changelog.d (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-02-2643-0/+46
|\ | | | | | | anoa/public_rooms_federate_develop
| * Don't log stack trace when client has gone away during media download (#4738)Erik Johnston2019-02-251-0/+1
| | | | | | | | | | | | | | | | * Don't log stack trace when client has gone away during media download * Newsfile * Fixup newsfile
| * Fix ACME config for python 2. (#4717)Richard van der Hoff2019-02-251-0/+1
| | | | | | Fixes #4675.
| * Merge pull request #4737 from matrix-org/erikj/failure_log_tbErik Johnston2019-02-252-1/+2
| |\ | | | | | | Log tracebacks correctly
| | * NewsfileErik Johnston2019-02-252-1/+2
| | |
| * | Merge pull request #4718 from matrix-org/erikj/fix_backfill_state_shredErik Johnston2019-02-251-0/+1
| |\ \ | | | | | | | | Fix backfill storing incorrect state for events
| | * | Fixup changelogErik Johnston2019-02-251-1/+1
| | | |
| | * | NewsfileErik Johnston2019-02-251-0/+1
| | | |
| * | | Merge pull request #4721 from matrix-org/erikj/msc_1866Erik Johnston2019-02-251-0/+1
| |\ \ \ | | | | | | | | | | MSC 1866 - Use M_UNSUPPORTED_ROOM_VERSION for invite API
| | * | | NewsfileErik Johnston2019-02-231-0/+1
| | | | |
| * | | | Merge pull request #4722 from ↵Erik Johnston2019-02-251-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | matrix-org/erikj/correctly_handle_keyring_exceptions Handle errors when fetching remote server keys
| | * | | NewsfileErik Johnston2019-02-231-0/+1
| | |/ /
| * / / NewsfileErik Johnston2019-02-231-0/+1
| |/ /
| * | Merge pull request #4716 from matrix-org/erikj/pusher_loggingErik Johnston2019-02-221-0/+1
| |\ \ | | | | | | | | Fix up pusher logging a bit
| | * | NewsfileErik Johnston2019-02-221-0/+1
| | |/
| * / NewsfileErik Johnston2019-02-221-0/+1
| |/
| * Add prometheus metrics for number of badge update pushes. (#4709)Richard van der Hoff2019-02-221-0/+1
| | | | | | | | | | | | We're counting the number of push notifications, but not the number of badges; I'd like to see if they are significant.
| * Better checks on newsfragments (#4698)Richard van der Hoff2019-02-221-0/+1
| | | | | | | | | | * You need an entry in the debian changelog (and not a regular newsfragment) for debian packaging changes. * Regular newsfragments must end in full stops.
| * Minor tweaks to acme docs (#4689)Richard van der Hoff2019-02-221-0/+1
| |
| * bail out early in on_new_receipts if no pushers (#4706)Richard van der Hoff2019-02-211-0/+1
| |
| * Run push_receipts_to_remotes as background job (#4707)Richard van der Hoff2019-02-211-0/+1
| | | | | | I suspect the CPU usage metrics for this are going to /dev/null at the moment.
| * Added HAProxy example (#4660)Benoît S2019-02-211-0/+1
| | | | | | | | | | | | | | | | | | | | * Added HAProxy example Proposal of an example with HAProxy. Asked by #4541. Signed-off-by: Benoît S. (“Benpro”) <gitlab@benpro.fr> * Following suggestions of @richvdh
| * Merge pull request #4263 from rkfg/developErik Johnston2019-02-211-0/+1
| |\ | | | | | | Prevent crash on pagination.
| | * Prevent crash on pagination.rkfg2018-12-061-0/+1
| | |
| * | Consider e2e_room_keys.is_verified column as booleanEric2019-02-201-0/+3
| | | | | | | | | | | | | | | | | | | | | This column was considered as an int, crashing the whole migration process Signed-off-by: Eric <eric@pedr0.net>
| * | Merge pull request #4694 from matrix-org/erikj/fix_sentry_config_formatErik Johnston2019-02-201-0/+1
| |\ \ | | | | | | | | Fixup generated metrics config
| | * | NewsfileErik Johnston2019-02-201-0/+1
| | | |
| * | | Add metrics for number of outgoing EDUs, by type (#4695)Richard van der Hoff2019-02-201-0/+1
| | | |
| * | | UPSERT many functionality (#4644)Amber Brown2019-02-201-0/+1
| | | |
| * | | Logging improvements for the pusher (#4691)Richard van der Hoff2019-02-201-0/+1
| | | |
| * | | Fix TaskStopped exceptions when outbound requests time out (#4690)Richard van der Hoff2019-02-201-0/+1
| | | |
| * | | Clean up gitignores (#4688)Richard van der Hoff2019-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | I just got bitten by a file being caught by the .gitignore, which shouldn't have been, and am now pissed off with the .gitignore. I have basically declared bankruptcy on it and started again.
| * | | Merge pull request #4678 from matrix-org/rav/tls_install_instructionsRichard van der Hoff2019-02-201-0/+1
| |\ \ \ | | |/ / | |/| | Attempt to clarify installation/config instructions
| | * | changelogRichard van der Hoff2019-02-191-0/+1
| | | |
| * | | Fix registration on workers (#4682)Erik Johnston2019-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move RegistrationHandler init to HomeServer * Move post registration actions to RegistrationHandler * Add post regisration replication endpoint * Newsfile
| * | | Run unit tests against python 3.7 (#4677)Richard van der Hoff2019-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Run unit tests against python 3.7 ... so that we span the full range of our supported python versions * Switch to xenial * fix psql fail * pep8 etc want python 3.6
| * | | Merge pull request #4671 from matrix-org/erikj/state_cache_invalidationErik Johnston2019-02-191-0/+1
| |\ \ \ | | |/ / | |/| | Batch cache invalidation over replication
| | * | NewsfileErik Johnston2019-02-181-0/+1
| | | |
| * | | Merge pull request #4676 from matrix-org/rav/pg95Richard van der Hoff2019-02-191-0/+1
| |\ \ \ | | | | | | | | | | Test against Postgres 9.5 as well as 9.4
| | * | | Test against Postgres 9.5 as well as 9.4Richard van der Hoff2019-02-191-0/+1
| | |/ / | | | | | | | | | | | | | | | | Postgres 9.5 is the first to support UPSERTs, so we should really run against it as well as 9.4.
| * | | Merge pull request #4652 from matrix-org/babolivier/acme-delegatedBrendan Abolivier2019-02-191-0/+1
| |\ \ \ | | | | | | | | | | Support .well-known delegation when issuing certificates through ACME
| | * \ \ Merge branch 'develop' into babolivier/acme-delegatedBrendan Abolivier2019-02-183-0/+3
| | |\ \ \
| | * | | | Typo in changelogAndrew Morgan2019-02-181-1/+1
| | | | | | | | | | | | | | | | | | Co-Authored-By: babolivier <contact@brendanabolivier.com>
| | * | | | Support .well-known delegation when issuing certificates through ACMEBrendan Abolivier2019-02-151-0/+1
| | | | | |
| * | | | | Merge pull request #4670 from matrix-org/erikj/register_login_splitErik Johnston2019-02-192-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Split /login into client_reader
| | * | | | | NewsfileErik Johnston2019-02-181-0/+1
| | | | | | |
| | * | | | | Update worker docsErik Johnston2019-02-181-1/+1
| | | | | | |
| * | | | | | Try and make TLS federation client code faster (#4674)Richard van der Hoff2019-02-191-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * fix to use makeContext so that we don't need to rebuild the certificateoptions each time
| | * | | | | | misc->featureRichard van der Hoff2019-02-191-0/+0
| | | | | | | |
| | * | | | | | changelogAmber Brown2019-02-191-0/+1
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #4642 from matrix-org/anoa/bans_room_upgradeAndrew Morgan2019-02-191-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Transfer bans on room upgrade
| | * | | | | Move member event processing and changelog fixAndrew Morgan2019-02-181-0/+0
| | | | | | |
| | * | | | | Add changelogAndrew Morgan2019-02-181-0/+1
| | | | | | |
| * | | | | | Merge pull request #4632 from matrix-org/erikj/basic_sentryErik Johnston2019-02-181-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add basic optional sentry.io integration
| | * | | | | | Fixup comments and add warningErik Johnston2019-02-131-1/+1
| | | | | | | |
| | * | | | | | NewsfileErik Johnston2019-02-121-0/+1
| | | | | | | |
| * | | | | | | Merge pull request #4666 from matrix-org/erikj/register_login_splitErik Johnston2019-02-181-0/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | Split out registration to worker
| | * | | | | | Update changelog.d/4666.featureWill Hunt2019-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re>
| | * | | | | | NewsfileErik Johnston2019-02-181-0/+1
| | | | | | | |
| * | | | | | | Merge pull request #4668 from matrix-org/erikj/catch_exceptionsErik Johnston2019-02-181-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Correctly handle HttpResponseException when handling device updates
| | * | | | | | | NewsfileErik Johnston2019-02-181-0/+1
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge pull request #4669 from matrix-org/erikj/log_exceptionErik Johnston2019-02-181-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Cleanup top level request exception logging
| | * | | | | | | NewsfileErik Johnston2019-02-181-0/+1
| | |/ / / / / /
| * | | | | | | Merge pull request #4651 from matrix-org/matthew/well-known-corsErik Johnston2019-02-181-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | set CORS on .well-known URI to unbreak modular
| | * | | | | | | FixupErik Johnston2019-02-181-1/+1
| | | | | | | | |
| | * | | | | | | changelogMatthew Hodgson2019-02-181-0/+1
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge pull request #4667 from matrix-org/erikj/fix_revoke_guest_access_workersErik Johnston2019-02-181-0/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Fix kicking guest users in worker mode
| | * | | | | | NewsfileErik Johnston2019-02-181-0/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #4643 from matrix-org/erikj/catch_exceptionsErik Johnston2019-02-181-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Correctly handle RequestSendFailed exceptions
| | * | | | | NewsfileErik Johnston2019-02-141-0/+1
| | | |_|/ / | | |/| | |
| * | | | | ChangelogTravis Ralston2019-02-151-0/+1
| | | | | |
| * | | | | Merge pull request #4647 from matrix-org/erikj/add_room_publishing_rulesErik Johnston2019-02-151-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Add configurable room list publishing rules
| | * | | | NewsfileErik Johnston2019-02-141-0/+1
| | |/ / /
| * | | | Merge branch 'master' into developRichard van der Hoff2019-02-141-1/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 0.99.1rc2 v0.99.1rc2Richard van der Hoff2019-02-131-1/+0
| | | | |
| * | | | Merge pull request #4450 from 14mRh4X0r/fix-dependency-messageRichard van der Hoff2019-02-131-0/+2
| |\ \ \ \ | | | | | | | | | | | | Fix error message for optional dependencies
| | * | | | Fix error message for optional dependenciesWillem Mulder2019-01-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Willem Mulder <willemmaster@hotmail.com>
| * | | | | Merge remote-tracking branch 'origin/release-v0.99.1' into developRichard van der Hoff2019-02-131-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | changelogRichard van der Hoff2019-02-131-0/+1
| | | | | |
| * | | | | Run `black` on user directory code (#4635)Amber Brown2019-02-131-0/+1
| |/ / / /
| * | | | Update changelog and versionErik Johnston2019-02-1230-31/+0
| | | | |
| * | | | Merge pull request #4608 from matrix-org/anoa/acls_room_upgradeErik Johnston2019-02-121-0/+1
| |\ \ \ \ | | |_|/ / | |/| | | Transfer Server ACLs on room upgrade
| | * | | ChangelogAndrew Morgan2019-02-111-0/+1
| | | | |
| * | | | Fixup changelog entriesErik Johnston2019-02-124-2/+2
| | | | |
| * | | | Merge pull request #4627 from matrix-org/erikj/user_ips_analyzeErik Johnston2019-02-121-0/+1
| |\ \ \ \ | | | | | | | | | | | | Analyze user_ips before running deduplication
| | * | | | NewsfileErik Johnston2019-02-121-0/+1
| | | | | |
| * | | | | Merge pull request #4626 from matrix-org/erikj/fixup_user_ips_dedupeErik Johnston2019-02-121-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Reduce user_ips bloat during dedupe background update
| | * | | | | NewsfileErik Johnston2019-02-121-0/+1
| | |/ / / /
| * | | | | Merge pull request #4625 from matrix-org/rav/fix_generate_config_warningsErik Johnston2019-02-121-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | fix self-signed cert notice from generate-config
| | * | | | | fix self-signed cert notice from generate-configRichard van der Hoff2019-02-121-0/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | fixes #4620
| * | | | | README updates (#4621)Richard van der Hoff2019-02-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of updates to the README/INSTALL.md. Fixes #4601.
| * | | | | Disable TLS by default (#4614)Richard van der Hoff2019-02-121-0/+1
| | | | | |
| * | | | | Fix error when loading cert if tls is disabled (#4618)Richard van der Hoff2019-02-121-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | If TLS is disabled, it should not be an error if no cert is given. Fixes #4554.
| * | | | Merge pull request #4619 from matrix-org/rav/remove_docker_no_tls_hacksErik Johnston2019-02-121-0/+1
| |\ \ \ \ | | | | | | | | | | | | Remove redundant entries from docker config
| | * | | | Remove redundant entries from docker configRichard van der Hoff2019-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * no_tls is now redundant (#4613) * we don't need a dummy cert any more (#4618)
| * | | | | Infer no_tls from presence of TLS listenersRichard van der Hoff2019-02-115-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than have to specify `no_tls` explicitly, infer whether we need to load the TLS keys etc from whether we have any TLS-enabled listeners.
| * | | | | Merge branch 'rav/no_create_server_contexts_if_no_tls' into rav/tls_cert/workRichard van der Hoff2019-02-111-0/+1
| |\ \ \ \ \
| | * | | | | Don't create server contexts when TLS is disabledRichard van der Hoff2019-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | we aren't going to use them anyway.
| * | | | | | Merge branch 'rav/tls_config_logging_fixes' into rav/tls_cert/workRichard van der Hoff2019-02-111-0/+1
| |\| | | | |
| | * | | | | Logging improvements around TLS certsRichard van der Hoff2019-02-111-0/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Log which file we're reading keys and certs from, and refactor the code a bit in preparation for other work
| * / / / / Fail cleanly if listener config lacks a 'port'Richard van der Hoff2019-02-111-0/+1
| |/ / / / | | | | | | | | | | | | | | | ... otherwise we would fail with a mysterious KeyError or something later.
| * | | | Move ClientTLSOptionsFactory init out of refresh_certificates (#4611)Richard van der Hoff2019-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | It's nothing to do with refreshing the certificates. No idea why it was here.
| * | | | Merge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updatingErik Johnston2019-02-111-0/+1
| |\ \ \ \ | | | | | | | | | | | | add updating of backup versions
| | * | | | add changelog entryHubert Chathi2019-02-061-0/+1
| | | | | |
| * | | | | Clean up default listener configuration (#4586)Richard van der Hoff2019-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearrange the comments to try to clarify them, and expand on what some of it means. Use a sensible default 'bind_addresses' setting. For the insecure port, only bind to localhost, and enable x_forwarded, since apparently it's for use behind a load-balancer.
| * | | | | Clarifications for reverse proxy docs (#4607)Richard van der Hoff2019-02-111-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out the reverse proxy info to a separate file, add some more info on reverse-proxying the federation port.
| * | | | ACME Reprovisioning (#4522)Amber Brown2019-02-111-0/+1
| | | | |
| * | | | Be tolerant of blank TLS fingerprints config (#4589)Amber Brown2019-02-111-0/+1
| | | | |
| * | | | Merge pull request #4420 from matrix-org/jaywink/openid-listenerErik Johnston2019-02-111-0/+1
| |\ \ \ \ | | | | | | | | | | | | New listener resource for the federation API "openid/userinfo" endpoint
| | * | | | Collapse changelog to one lineJason Robinson2019-01-231-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org>
| | * | | | Add changelog for openid resource additionJason Robinson2019-01-231-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org>
| * | | | | Allow "unavailable" presence status for /sync (#4592)Valentin Anger2019-02-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow "unavailable" presence status for /sync Closes #3772, closes #3779 Signed-off-by: Valentin Anger <valentin.an.1999@gmail.com> * Add changelog for PR 4592
| * | | | | Fix 'no unique or exclusion constraint' error (#4591)Richard van der Hoff2019-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more tables to the list of tables which need a background update to complete before we can upsert into them, which fixes a race against the background updates.
| * | | | | Deduplicate some code in synapse.app (#4567)Amber Brown2019-02-081-0/+1
| | | | | |
| * | | | | Update MSC1711 FAQ to be explicit about well-known (#4584)Erik Johnston2019-02-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A surprising number of people are using the well-known method, and are simply copying the example configuration. This is problematic as the example includes an explicit port, which causes inbound federation requests to have the HTTP Host header include the port, upsetting some reverse proxies. Given that, we update the well-known example to be more explicit about the various ways you can set it up, and the consequence of using an explict port.
| * | | | | Merge branch 'master' into developRichard van der Hoff2019-02-071-0/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/release-v0.99.0'Richard van der Hoff2019-02-071-0/+1
| | |\ \ \ \ \
| | | * | | | | Update ACME docs to include port instructions (#4578) github/release-v0.99.0 release-v0.99.0Andrew Morgan2019-02-071-0/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into developRichard van der Hoff2019-02-061-0/+1
| |\| | | | | |
| | * | | | | | Fix docker upload job to push -py2 images (#4576)Richard van der Hoff2019-02-061-0/+1
| | |/ / / / /
| * | | | | | Merge branch 'master' into developRichard van der Hoff2019-02-053-3/+0
| |\| | | | |
| | * | | | | v0.99.0 v0.99.0Richard van der Hoff2019-02-057-7/+0
| | | | | | |
| | * | | | | Neilj/1711faq (#4572)Neil Johnson2019-02-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSC1711 certificates FAQ
| | * | | | | Enable ACME support in the docker image (#4566)Richard van der Hoff2019-02-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: * Fix wrapping in docker readme * Clean up some docs on the docker image * a workaround for #4554
| | * | | | | Docker: only copy what we need to the build image (#4562)Richard van der Hoff2019-02-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two reasons this is a good thing: * first, it means that you don't end up with stuff kicking around your working copy ending up in the build image by mistake (which can upset the pip install process) * second: it means that the docker image cache is more effective, and we can reuse docker images when iterating on the docker stuff.
| | * | | | | Fix default ACME config for py2 (#4564)Richard van der Hoff2019-02-051-0/+1
| | | | | | | | | | | | | | | | | | | | | Fixes #4559
| | * | | | | switch docker image to py3 by default (#4558)Richard van der Hoff2019-02-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch the matrixdotorg/synapse:latest Docker image to use python 3
| | * | | | | fix typo in config comments (#4557)Richard van der Hoff2019-02-051-0/+1
| | | | | | |
| | * | | | | Merge branch 'release-v0.99.0' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-02-013-3/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | anoa/acme_docs
| | | * | | | | 0.99.0rc4 v0.99.0rc4Richard van der Hoff2019-02-013-3/+0
| | | | | | | |
| | * | | | | | Add changelogAndrew Morgan2019-02-011-0/+1
| | |/ / / / /
| * | | / / / Filter user directory state query to a subset of state events (#4462)Andrew Morgan2019-02-051-0/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Filter user directory state query to a subset of state events * Add changelog
| * | | | | Merge pull request #4546 from ↵Richard van der Hoff2019-02-011-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/rav/silence_critical_error_from_federation Fix noisy "twisted.internet.task.TaskStopped" errors in logs
| | * | | | | Fix noisy "twisted.internet.task.TaskStopped" errors in logsRichard van der Hoff2019-02-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4003
| * | | | | | Merge remote-tracking branch 'origin/release-v0.99.0' into developRichard van der Hoff2019-02-011-0/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Treat an invalid .well-known the same as an absent oneRichard van der Hoff2019-02-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... basically, carry on and fall back to SRV etc.
| * | | | | | Merge branch 'release-v0.99.0' into developRichard van der Hoff2019-02-012-0/+2
| |\| | | | |
| | * | | | | changelogRichard van der Hoff2019-02-011-0/+1
| | | | | | |
| | * | | | | Update federation routing logic to check .well-known before SRVRichard van der Hoff2019-01-311-0/+1
| | |/ / / /
| | * | | | v0.99.0rc3 v0.99.0rc3Richard van der Hoff2019-01-313-3/+0
| | | | | |
| | * | | | Add some debug for membership syncing issues (#4538)Richard van der Hoff2019-01-311-0/+1
| | | | | | | | | | | | | | | | | | I can't figure out what's going on with #4422 and #4436; perhaps this will help.
| | * | | | Fix infinite loop when an event is redacted in a v3 room (#4535)Richard van der Hoff2019-01-311-0/+1
| | | | | |
| | * | | | update debian installation instructions (#4526)Richard van der Hoff2019-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * update debian installation instructions * docs PR is docs
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-01-3183-81/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | anoa/room_upgrade_federatable
| | * | | | | Reject large transactions on federation (#4513)Andrew Morgan2019-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reject large transactions on federation * Add changelog * lint * Simplify large transaction handling
| | * | | | | Merge remote-tracking branch 'origin/release-v0.99.0' into developRichard van der Hoff2019-01-3082-82/+0
| | |\| | | |
| | | * | | | v0.99.0rc2 v0.99.0rc2Richard van der Hoff2019-01-302-2/+0
| | | | | | |
| | | * | | | Merge remote-tracking branch 'origin/develop' into release-v0.99.0Richard van der Hoff2019-01-301-0/+1
| | | |\ \ \ \
| | | * | | | | ACME Upgrade Docs (#4528)Amber Brown2019-01-301-0/+1
| | | | | | | |
| | | * | | | | 0.99.0rc1 v0.99.0rc1Richard van der Hoff2019-01-3081-81/+0
| | | | | | | |
| | * | | | | | by default include m.room.encryption on invites (#3902)Matthew Hodgson2019-01-301-0/+1
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * by default include m.room.encryption on invites * fix constant * changelog
| | * | | | | NewsfileErik Johnston2019-01-301-0/+1
| | |/ / / /
| * / / / / Add changelogAndrew Morgan2019-01-301-0/+1
| |/ / / /
| * | | | Merge pull request #4472 from matrix-org/neilj/room_capabilitiesErik Johnston2019-01-301-0/+1
| |\ \ \ \ | | | | | | | | | | | | Server capabilities support
| | * \ \ \ Merge branch 'develop' into neilj/room_capabilitiesNeil Johnson2019-01-3048-6/+42
| | |\ \ \ \
| | * | | | | update to reflect broadening scopeNeil Johnson2019-01-291-1/+1
| | | | | | |
| | * | | | | towncrierNeil Johnson2019-01-251-0/+1
| | | | | | |
| * | | | | | Fix replication for room v3 (#4523)Erik Johnston2019-01-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix replication for room v3 We were not correctly quoting the path fragments over http replication, which meant that it exploded when the event IDs had a slash in them * Newsfile
| * | | | | | ACME config cleanups (#4525)Richard van der Hoff2019-01-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Handle listening for ACME requests on IPv6 addresses the weird url-but-not-actually-a-url-string doesn't handle IPv6 addresses without extra quoting. Building a string which you are about to parse again seems like a weird choice. Let's just use listenTCP, which is consistent with what we do elsewhere. * Clean up the default ACME config make it look a bit more consistent with everything else, and tweak the defaults to listen on port 80. * newsfile
| * | | | | | NewsfileErik Johnston2019-01-301-0/+1
| | | | | | |
| * | | | | | Merge pull request #4521 from matrix-org/rav/fed_routing/cleanupsRichard van der Hoff2019-01-301-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Tiny .well-known fixes
| | * | | | | | newsfileRichard van der Hoff2019-01-301-0/+1
| | | | | | | |
| * | | | | | | Follow redirects on .well-known (#4520)Richard van der Hoff2019-01-301-0/+1
| | | | | | | |
| * | | | | | | SIGHUP for TLS cert reloading (#4495)Amber Brown2019-01-301-0/+1
| |/ / / / / /
| * | | | | | Add a caching layer to .well-known responses (#4516)Richard van der Hoff2019-01-301-0/+1
| | | | | | |
| * | | | | | Fix flake8 (#4519)Amber Brown2019-01-301-0/+1
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #4486 from xperimental/workaround-4216Richard van der Hoff2019-01-301-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Implement workaround for login error.
| | * | | | | Implement workaround for login error.Robert Jacob2019-01-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robert Jacob <xperimental@solidproject.de>
| * | | | | | NewsfileErik Johnston2019-01-291-0/+1
| | | | | | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-01-291-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | erikj/redactions_eiah
| | * \ \ \ \ \ Merge pull request #4514 from matrix-org/erikj/remove_event_idErik Johnston2019-01-291-0/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove usages of event ID's domain
| | | * | | | | | NewsfileErik Johnston2019-01-291-0/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-01-2925-8/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/redactions_eiah
| | * | | | | | | Merge pull request #4483 from matrix-org/erikj/event_v2Erik Johnston2019-01-291-0/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Implement event format V2
| | | * | | | | | | NewsfileErik Johnston2019-01-291-0/+1
| | | | | | | | | |
| | * | | | | | | | Merge pull request #4512 from matrix-org/anoa/consent_dirAndrew Morgan2019-01-291-0/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | Check consent dir path on startup
| | | * | | | | | | Add changelogAndrew Morgan2019-01-291-0/+1
| | | | | | | | | |
| | * | | | | | | | Relax requirement for a content-type on .well-known (#4511)Richard van der Hoff2019-01-291-0/+1
| | | | | | | | | |
| | * | | | | | | | Merge pull request #4498 from matrix-org/travis/fix-docs-public_baseurlTravis Ralston2019-01-291-0/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | Don't recommend :8448 to people on public_baseurl
| | | * | | | | | | Create 4498.miscTravis Ralston2019-01-281-0/+1
| | | | | | | | | |
| | * | | | | | | | Do not generate self-signed TLS certificates by default. (#4509)Amber Brown2019-01-291-0/+1
| | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge pull request #4481 from matrix-org/erikj/event_builderErik Johnston2019-01-291-0/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor event building into EventBuilder
| | | * | | | | | | NewsfileErik Johnston2019-01-291-0/+1
| | | | | | | | | |
| | * | | | | | | | Implement MSC1708 (.well-known lookups for server routing) (#4489)Richard van der Hoff2019-01-2917-8/+9
| | | | | | | | | |
| | * | | | | | | | Merge pull request #4510 from matrix-org/erikj/fixup_compute_event_signatureErik Johnston2019-01-291-0/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixup calls to `comput_event_signature`
| | | * | | | | | | | NewsfileErik Johnston2019-01-291-0/+1
| | | | | | | | | | |
| | * | | | | | | | | Enable configuring test log level via env var (#4506)Richard van der Hoff2019-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I got fed up with always adding '@unittest.DEBUG' every time I needed to debug a test.
| * | | | | | | | | | NewsfileErik Johnston2019-01-291-0/+1
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #4496 from matrix-org/erikj/invite_fallbackErik Johnston2019-01-291-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | Implement fallback for V2 invite API
| | * | | | | | | | NewsfileErik Johnston2019-01-281-0/+1
| | | | | | | | | |
| * | | | | | | | | Make linearizer more quiet (#4507)Amber Brown2019-01-291-0/+1
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #4494 from matrix-org/erikj/fixup_event_validatorErik Johnston2019-01-291-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Split up event validation between event and builder
| | * | | | | | | | NewsfileErik Johnston2019-01-281-0/+1
| | | | | | | | | |
| * | | | | | | | | Fix typo in upserts code (#4505)Amber Brown2019-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix obvious problem :| * changelog
| * | | | | | | | | Merge pull request #4493 from matrix-org/erikj/refactor_event_signingErik Johnston2019-01-291-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Refactor event signing to work on dicts
| | * | | | | | | | | NewsfileErik Johnston2019-01-281-0/+1
| | |/ / / / / / / /
| * | | | | | | | | Use SimpleResolverComplexifier in tests (#4497)Richard van der Hoff2019-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | two reasons for this. One, it saves a bunch of boilerplate. Two, it squashes unicode to IDNA-in-a-`str` (even on python 3) in a way that it turns out we rely on to give consistent behaviour between python 2 and 3.
| * | | | | | | | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_versionErik Johnston2019-01-281-0/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | Pass through room version to event auth
| | * | | | | | | | NewsfileErik Johnston2019-01-251-0/+1
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Fix worker TLS (#4492)Amber Brown2019-01-281-0/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * load cert * changelog * fix
| * | | | | | | Fix UPSERTs on SQLite 3.24+ (#4477)Amber Brown2019-01-283-2/+3
| | | | | | | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-01-289-1/+9
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | anoa/dm_room_upgrade
| | * | | | | | Remove --process-dependency-links from UPGRADE.rst (#4485)Aaron Raimist2019-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove --process-dependency-links from UPGRADE.rst Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>
| | * | | | | | changelogRichard van der Hoff2019-01-281-0/+1
| | | | | | | |
| | * | | | | | Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487)Richard van der Hoff2019-01-281-0/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that the library does a better job of parsing URIs than our reinvented wheel. Who knew. There are two things going on here. The first is that, unlike parse_server_name, URI.fromBytes will strip off square brackets from IPv6 literals, which means that it is valid input to ClientTLSOptionsFactory and HostnameEndpoint. The second is that we stay in `bytes` throughout (except for the argument to ClientTLSOptionsFactory), which avoids the weirdness of (sometimes) ending up with idna-encoded values being held in `unicode` variables. TBH it probably would have been ok but it made the tests fragile.
| | * | | | | Merge pull request #4470 from matrix-org/erikj/require_format_versionErik Johnston2019-01-251-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Require event format version to parse or create events
| | | * | | | | NewsfileErik Johnston2019-01-251-0/+1
| | | | | | | |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-01-254-0/+4
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/sqlite_native_upsert
| | | * | | | | | Fix quoting for allowed_local_3pids example config (#4476)Richard van der Hoff2019-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you use double-quotes here, you have to escape your backslashes. It's much easier with single-quotes. (Note that the existing double-backslashes are already interpreted by python's """ parsing.)
| | | * | | | | | Fix Host header sent by MatrixFederationAgent (#4468)Richard van der Hoff2019-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the Host header logic down here so that (a) it is used if we reuse the agent elsewhere, and (b) we can mess about with it with .well-known.
| | | * | | | | | Don't require sqlite3 when using postgres (#4466)Andrew Morgan2019-01-251-0/+1
| | | | | | | | |
| | * | | | | | | NewsfileErik Johnston2019-01-252-1/+2
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-01-2521-0/+21
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | anoa/dm_room_upgrade
| | * | | | | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_roomsAndrew Morgan2019-01-251-0/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | Ability to search entire room history after upgrading room
| | | * | | | | Add changelogAndrew Morgan2019-01-181-0/+1
| | | | | | | |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813Erik Johnston2019-01-2517-1/+17
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge pull request #4448 from matrix-org/erikj/get_pdu_versionsErik Johnston2019-01-241-0/+1
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add room_version param to get_pdu
| | | | * | | | | | NewsfileErik Johnston2019-01-231-0/+1
| | | | | |_|_|/ / | | | | |/| | | |
| | | * | | | | | Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invitesErik Johnston2019-01-241-0/+1
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Store rejected remote invite events as outliers
| | | | * | | | | | NewsfileErik Johnston2019-01-231-0/+1
| | | | |/ / / / /
| | | * | | | | | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2Erik Johnston2019-01-241-0/+1
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | Add support for persisting event format versions
| | | | * | | | | Update newsfileErik Johnston2019-01-231-1/+1
| | | | | | | | |
| | | * | | | | | Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fixAndrew Morgan2019-01-241-0/+1
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a 60s timeout to filtered room directory queries
| | | | * | | | | | Add changelogAndrew Morgan2019-01-241-0/+1
| | | | | | | | | |
| | | * | | | | | | Merge pull request #4464 from matrix-org/rav/fix_srv_lookupRichard van der Hoff2019-01-241-0/+1
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | MatrixFederationAgent: Look up the right SRV record
| | | | * | | | | | | Look up the right SRV recordRichard van der Hoff2019-01-241-0/+1
| | | | | | | | | | |
| | | * | | | | | | | Generate the debian config during build (#4444)Richard van der Hoff2019-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than hardcoding a config which we always forget to update, generate it from the default config.
| | | * | | | | | | | Fix UnboundLocalError in post_urlencoded_get_json (#4460)Richard van der Hoff2019-01-241-0/+1
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | This could cause exceptions if the id server returned 4xx responses.
| | | * | | | | | | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_checkNeil Johnson2019-01-241-0/+1
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Neilj/fix threepid auth check
| | | | * | | | | | | move guard out of is_threepid_reserved and into register.pyNeil Johnson2019-01-221-1/+1
| | | | | | | | | | |
| | | | * | | | | | | Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-221-0/+1
| | | | | | | | | | |
| | | * | | | | | | | Merge pull request #4458 from matrix-org/dbkr/public_baseurl_docNeil Johnson2019-01-241-0/+1
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clarify docs for public_baseurl
| | | | * | | | | | | | ChangelogDavid Baker2019-01-241-0/+1
| | | | | |/ / / / / / | | | | |/| | | | | |
| | | * / | | | | | | Fix UPSERT check (#4459)Amber Brown2019-01-241-0/+1
| | | |/ / / / / / /
| | | * | | | | | | Use native UPSERTs where possible (#4306)Amber Brown2019-01-241-0/+1
| | | | | | | | | |
| | | * | | | | | | Don't send IP addresses as SNI (#4452)Richard van der Hoff2019-01-241-0/+1
| | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here is that we have cut-and-pasted an impl from Twisted, and then failed to maintain it. It was fixed in Twisted in https://github.com/twisted/twisted/pull/1047/files; let's do the same here.
| | | * | | | | | Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backportAndrew Morgan2019-01-231-0/+1
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add metric for user dir current event stream position
| | | | * | | | | | Add changelogAndrew Morgan2019-01-231-0/+1
| | | | | | | | | |
| | | * | | | | | | Merge pull request #4428 from matrix-org/rav/matrix_federation_agentRichard van der Hoff2019-01-231-0/+1
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | Move SRV magic into an Agent-like thing
| | | | * | | | | | changelogRichard van der Hoff2019-01-221-0/+1
| | | | | | | | | |
| | | * | | | | | | debian package: symlink to python-3.X (#4433)Richard van der Hoff2019-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the debian package, make the virtualenv symlink python to /usr/bin/python3.X rather than /usr/bin/python3. Also make sure we depend on the right python3.x package. This might help a bit with subtle failures when people install a package from the wrong distro (https://github.com/matrix-org/synapse/issues/4431).
| | | * | | | | | | Fixup removal of duplicate `user_ips` rows (#4432)Erik Johnston2019-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unnecessary ORDER BY clause * Add logging * Newsfile
| | | * | | | | | | Support ACME for certificate provisioning (#4384)Amber Brown2019-01-231-0/+1
| | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | NewsfileErik Johnston2019-01-231-0/+1
| | | |_|_|/ / / | | |/| | | | |
| | * | | | | | NewsfileErik Johnston2019-01-231-0/+1
| | |/ / / / /
| | * | | | | Merge pull request #4434 from matrix-org/erikj/fix_user_ips_dedupErik Johnston2019-01-221-0/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | Fix bug when removing duplicate rows from user_ips
| | | * | | | NewsfileErik Johnston2019-01-221-0/+1
| | | | | | |
| | * | | | | Merge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registrationNeil Johnson2019-01-221-0/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | Config option to disable requesting MSISDN on registration
| | | * | | | Config option to disable requesting MSISDN on registrationNeil Johnson2019-01-211-0/+1
| | | | | | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-01-221-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | anoa/dm_room_upgrade