matrix/thirdparty/synapse.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Complete the SAML2 implementation (#5422)	Andrew Morgan	2020-02-14	7	-45/+231
\|\
\| *	Complete the SAML2 implementation (#5422)	Richard van der Hoff	2019-07-02	7	-45/+231
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* SAML2 Improvements and redirect stuff Signed-off-by: Alexander Trost <galexrt@googlemail.com> * Code cleanups and simplifications. Also: share the saml client between redirect and response handlers. * changelog * Revert redundant changes to static js * Move all the saml stuff out to a centralised handler * Add support for tracking SAML2 sessions. This allows us to correctly handle `allow_unsolicited: False`. * update sample config * cleanups * update sample config * rename BaseSSORedirectServlet for consistency * Address review comments
\| \| *	Merge branch 'develop' into rav/saml2_client	Richard van der Hoff	2019-07-01	55	-450/+832
\| \| \|\
\| \| * \|	Address review comments	Richard van der Hoff	2019-07-01	1	-5/+7
\| \| \| \|
\| \| * \|	rename BaseSSORedirectServlet for consistency	Richard van der Hoff	2019-06-27	1	-3/+3
\| \| \| \|
\| \| * \|	update sample config	Richard van der Hoff	2019-06-27	1	-6/+13
\| \| \| \|
\| \| * \|	cleanups	Richard van der Hoff	2019-06-27	3	-11/+18
\| \| \| \|
\| \| * \|	update sample config	Richard van der Hoff	2019-06-26	1	-0/+13
\| \| \| \|
\| \| * \|	Add support for tracking SAML2 sessions.	Richard van der Hoff	2019-06-26	2	-3/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to correctly handle `allow_unsolicited: False`.
\| \| * \|	Move all the saml stuff out to a centralised handler	Richard van der Hoff	2019-06-26	4	-50/+96
\| \| \| \|
\| \| * \|	Revert redundant changes to static js	Richard van der Hoff	2019-06-26	1	-4/+2
\| \| \| \|
\| \| * \|	Merge branch 'develop' into rav/saml2_client	Richard van der Hoff	2019-06-26	478	-11486/+18913
\| \| \|\ \
\| \| * \| \|	changelog	Richard van der Hoff	2019-06-11	1	-0/+1
\| \| \| \| \|
\| \| * \| \|	Merge tag 'v1.0.0rc3' into rav/saml2_client	Richard van der Hoff	2019-06-11	6	-2/+14
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Synapse 1.0.0rc3 (2019-06-10) ============================= Security: Fix authentication bug introduced in 1.0.0rc1. Please upgrade to rc3 immediately
\| \| * \| \| \|	Code cleanups and simplifications.	Richard van der Hoff	2019-06-11	6	-50/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also: share the saml client between redirect and response handlers.
\| \| * \| \| \|	Merge remote-tracking branch 'origin/develop' into rav/saml2_client	Richard van der Hoff	2019-06-10	157	-1096/+5758
\| \| \|\ \ \ \
\| \| * \| \| \| \|	SAML2 Improvements and redirect stuff	Alexander Trost	2019-06-02	5	-2/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Alexander Trost <galexrt@googlemail.com>
* \| \| \| \| \| \|	Merge pull request #5587 from matrix-org/erikj/fix_synctl	Andrew Morgan	2020-02-14	2	-6/+7
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #5587 from matrix-org/erikj/fix_synctl	Erik Johnston	2019-07-02	2	-6/+7
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix --no-daemonize flag for synctl
\| \| * \| \| \| \| \|	Newsfile	Erik Johnston	2019-07-02	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix --no-daemonize flag for synctl	Erik Johnston	2019-07-02	1	-6/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add ability to set timezone for Docker container (#5383)	Andrew Morgan	2020-02-14	3	-1/+3
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add ability to set timezone for Docker container (#5383)	Amir Zarrinkafsh	2019-07-02	3	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Amir Zarrinkafsh <nightah@me.com>
* \| \| \| \| \| \| \|	Fix JWT login with new users (#5586)	Andrew Morgan	2020-02-14	2	-6/+4
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix JWT login with new users (#5586)	PauRE	2019-07-02	2	-6/+4
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
* \| \| \| \| \| \|	fix async/await consentresource (#5585)	Andrew Morgan	2020-02-14	2	-1/+4
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	fix async/await consentresource (#5585)	Amber Brown	2019-07-01	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #5582
* \| \| \| \| \| \|	Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloop	Andrew Morgan	2020-02-14	2	-2/+20
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloop	Erik Johnston	2019-07-01	2	-2/+20
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	Fix sync tightloop bug.
\| \| * \| \| \| \|	Fixup comment	Erik Johnston	2019-07-01	1	-6/+13
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Newsfile	Erik Johnston	2019-06-21	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix sync tightloop bug.	Erik Johnston	2019-06-21	1	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If, for some reason, presence updates take a while to persist then it can trigger clients to tightloop calling `/sync` due to the presence handler returning updates but not advancing the stream token. Fixes #5503.
* \| \| \| \| \| \|	Make the http server handle coroutine-making REST servlets (#5475)	Andrew Morgan	2020-02-14	12	-174/+162
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Make the http server handle coroutine-making REST servlets (#5475)	Amber Brown	2019-06-29	12	-174/+162
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimit	Andrew Morgan	2020-02-14	0	-0/+0
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimit	Brendan Abolivier	2019-06-28	2	-0/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't update the ratelimiter before sending a 3PID invite
\| \| * \| \| \| \| \|	Only ratelimit when sending the email	Brendan Abolivier	2019-06-28	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we do the opposite, an event can arrive after or while sending the email and the 3PID invite event will get ratelimited.
\| \| * \| \| \| \| \|	Changelog	Brendan Abolivier	2019-06-28	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Don't update the ratelimiter before sending a 3PID invite	Brendan Abolivier	2019-06-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This would cause emails being sent, but Synapse responding with a 429 when creating the event. The client would then retry, and with bad timing the same scenario would happen again. Some testing I did ended up sending me 10 emails for one single invite because of this.
* \| \| \| \| \| \| \|	Don't log GC 0s at INFO (#5557)	Andrew Morgan	2020-02-14	2	-1/+5
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Don't log GC 0s at INFO (#5557)	Amber Brown	2019-06-28	2	-1/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Update the TLS cipher string and provide configurability for TLS on outgoing ↵	Andrew Morgan	2020-02-14	7	-9/+190
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	federation (#5550)
\| * \| \| \| \| \| \|	Update the TLS cipher string and provide configurability for TLS on outgoing ↵	Amber Brown	2019-06-28	7	-9/+190
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	federation (#5550)
* \| \| \| \| \| \| \|	Added possibilty to disable local password authentication (#5092)	Andrew Morgan	2020-02-14	5	-1/+18
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Added possibilty to disable local password authentication (#5092)	Daniel Hoffend	2019-06-27	5	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Daniel Hoffend <dh@dotlan.net>
* \| \| \| \| \| \| \|	Include systemd-python in Debian package to allow logging to journal (#5261)	Andrew Morgan	2020-02-14	2	-1/+8
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Include systemd-python in Debian package to allow logging to journal (#5261)	Silke Hofstra	2019-06-27	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Silke Hofstra <silke@slxh.eu>
* \| \| \| \| \| \| \|	Make it clearer that the template dir is relative to synapse's root dir (#5543)	Andrew Morgan	2020-02-14	3	-2/+19
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make it clearer that the template dir is relative to synapse's root dir (#5543)	Andrew Morgan	2019-06-27	3	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Helps address #5444
* \| \| \| \| \| \| \|	Merge pull request #5559 from matrix-org/erikj/refactor_changed_devices	Andrew Morgan	2020-02-14	4	-37/+98
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #5559 from matrix-org/erikj/refactor_changed_devices	Erik Johnston	2019-06-27	4	-37/+98
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|	Refactor devices changed query to pull less from DB
\| \| * \| \| \| \| \|	Review comments	Erik Johnston	2019-06-27	2	-7/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Move changelog	Erik Johnston	2019-06-26	1	-0/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Refactor and comment sync device list code	Erik Johnston	2019-06-26	1	-17/+53
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Use batch_iter and correct docstring	Erik Johnston	2019-06-26	1	-15/+12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Rename get_users_whose_devices_changed	Erik Johnston	2019-06-26	3	-5/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Newsfile	Erik Johnston	2019-06-26	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Refactor get_user_ids_changed to pull less from DB	Erik Johnston	2019-06-26	3	-28/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a client asks for users whose devices have changed since a token we used to pull all users from the database since the token, which could easily be thousands of rows for old tokens. This PR changes this to only check for changes for users the client is actually interested in. Fixes #5553
* \| \| \| \| \| \| \|	Docker image: Add a migrate_config mode (#5567)	Andrew Morgan	2020-02-14	4	-17/+58
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Docker image: Add a migrate_config mode (#5567)	Richard van der Hoff	2019-06-27	4	-17/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... to help people escape env var hell
* \| \| \| \| \| \| \|	Docker image: open the non-TLS port by default. (#5568)	Andrew Morgan	2020-02-14	2	-0/+2
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Docker image: open the non-TLS port by default. (#5568)	Richard van der Hoff	2019-06-27	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's not much point in binding to localhost when it's in a docker container.
* \| \| \| \| \| \| \|	Deprecate the env var way of running the docker image (#5566)	Andrew Morgan	2020-02-14	4	-154/+99
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Deprecate the env var way of running the docker image (#5566)	Richard van der Hoff	2019-06-27	4	-154/+99
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is mostly a documentation change, but also adds a default value for SYNAPSE_CONFIG_PATH, so that running from the generated config is the default, and will Just Work provided your config is in the right place.
* \| \| \| \| \| \| \|	Fix JWT login (#5555)	Andrew Morgan	2020-02-14	3	-1/+3
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix JWT login (#5555)	PauRE	2019-06-27	3	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix JWT login with register Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Add pyjwt conditional dependency Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Added changelog file Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Improved changelog description Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
* \| \| \| \| \| \| \|	Merge pull request #5565 from matrix-org/rav/docker/fix_log_config	Andrew Morgan	2020-02-14	3	-1/+14
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #5565 from matrix-org/rav/docker/fix_log_config	Richard van der Hoff	2019-06-27	3	-1/+14
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docker: generate our own log config
\| \| * \| \| \| \| \| \|	changelog	Richard van der Hoff	2019-06-26	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Docker: generate our own log config	Richard van der Hoff	2019-06-26	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When running under docker, we want to use docker's own logging stuff rather than losing the logs somewhere on the container's filesystem, so let's use log configs that spit logs out to stdout instead.
\| \| * \| \| \| \| \| \|	Add support for SYNAPSE_CONFIG_DIR	Richard van der Hoff	2019-06-26	2	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Reduce the amount of stuff we send in the docker context (#5564)	Andrew Morgan	2020-02-14	2	-9/+14
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Reduce the amount of stuff we send in the docker context (#5564)	Richard van der Hoff	2019-06-27	2	-9/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this makes docker builds a bit faster.
* \| \| \| \| \| \| \| \|	Merge pull request #5563 from matrix-org/rav/docker/data_dir	Andrew Morgan	2020-02-14	3	-4/+25
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5563 from matrix-org/rav/docker/data_dir	Richard van der Hoff	2019-06-27	3	-4/+25
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docker image: add support for SYNAPSE_DATA_DIR parameter
\| \| * \| \| \| \| \| \|	changelog	Richard van der Hoff	2019-06-26	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Docker image: add support for SYNAPSE_DATA_DIR parameter	Richard van der Hoff	2019-06-26	2	-4/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #4830.
\| \| * \| \| \| \| \| \|	document supported env vars for docker 'generate' option	Richard van der Hoff	2019-06-26	1	-0/+7
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5562 from matrix-org/rav/docker/no-generate-keys	Andrew Morgan	2020-02-14	2	-8/+24
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5562 from matrix-org/rav/docker/no-generate-keys	Richard van der Hoff	2019-06-27	2	-8/+24
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docker: only run --generate-keys when generating config on-the-fly.
\| \| * \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2019-06-26	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Docker: only run --generate-keys when generating config on-the-fly.	Richard van der Hoff	2019-06-26	1	-7/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't want to generate any missing configs when running from a precanned config. (There's a strong argument that we don't want to do this at all, since generating a new signing key on each invocation sounds disasterous, but I don't fancy unpicking that for now.)
\| \| * \| \| \| \| \| \| \|	improve logging for generate_config_from_template	Richard van der Hoff	2019-06-26	1	-1/+2
\| \| \|/ / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #5561 from matrix-org/rav/docker/refactor	Andrew Morgan	2020-02-14	2	-62/+118
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5561 from matrix-org/rav/docker/refactor	Richard van der Hoff	2019-06-27	2	-62/+118
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor the docker/start.py script
\| \| * \| \| \| \| \| \|	changelog	Richard van der Hoff	2019-06-26	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	isort	Richard van der Hoff	2019-06-25	1	-4/+5
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add a main() function	Richard van der Hoff	2019-06-25	1	-8/+11
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Factor out a run_generate_config function	Richard van der Hoff	2019-06-25	1	-17/+28
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Factor out "generate_config_from_template"	Richard van der Hoff	2019-06-25	1	-41/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... and inline generate_secrets
* \| \| \| \| \| \| \| \|	Merge pull request #5570 from almereyda/patch-2	Andrew Morgan	2020-02-14	2	-2/+3
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5570 from almereyda/patch-2	Richard van der Hoff	2019-06-27	2	-2/+3
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update purge_api README
\| \| * \| \| \| \| \| \| \|	fix changelog	Richard van der Hoff	2019-06-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Create 5570.misc	jon r	2019-06-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jon Richter <jon@allmende.io>
\| \| * \| \| \| \| \| \| \|	Update purge_api README	jon r	2019-06-27	1	-2/+2
\| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This points the reverse links at the intended location.
* \| \| \| \| \| \| \| \|	Merge pull request #5313 from twrist/patch-1	Andrew Morgan	2020-02-14	2	-2/+5
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5313 from twrist/patch-1	Richard van der Hoff	2019-06-27	2	-2/+5
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|	Update HAProxy example rules
\| \| * \| \| \| \| \| \|	Create 5313.misc	Ike Johnson	2019-06-02	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Update HAProxy example rules	Ike Johnson	2019-06-02	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These new rules allow a user to instead route only matrix traffic, allowing them to run matrix on the domain without affecting their existing websites
* \| \| \| \| \| \| \| \|	Merge pull request #5552 from matrix-org/rav/github_templates	Andrew Morgan	2020-02-14	3	-5/+7
\|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge pull request #5552 from matrix-org/rav/github_templates	Richard van der Hoff	2019-06-26	3	-5/+7
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update github templates
\| \| * \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2019-06-25	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Update github templates	Richard van der Hoff	2019-06-25	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Update SUPPORT.md	Richard van der Hoff	2019-06-25	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Improve docs on choosing server_name (#5558)	Andrew Morgan	2020-02-14	2	-13/+19
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Improve docs on choosing server_name (#5558)	Richard van der Hoff	2019-06-26	2	-13/+19
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #4901
* \| \| \| \| \| \| \| \| \|	Remove & changelog (#5548)	Andrew Morgan	2020-02-14	3	-55/+2
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove & changelog (#5548)	Amber Brown	2019-06-26	2	-54/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into develop	Andrew Morgan	2019-06-25	3	-2/+7
\| \|\\| \| \| \| \| \| \| \| \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Fix broken link in MSC1711 FAQ Update changelog to better expain password reset change (#5545)
\| \| * \| \| \| \| \| \|	Merge branch 'release-v1.0.0'	Andrew Morgan	2019-06-25	2	-1/+6
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* release-v1.0.0: Update changelog to better expain password reset change (#5545)
\| \| * \| \| \| \| \| \| \|	Fix broken link in MSC1711 FAQ	Richard van der Hoff	2019-06-25	1	-1/+1
\| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Prevent multiple upgrades on the same room at once (#5051)	Andrew Morgan	2020-02-14	4	-53/+6905
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Prevent multiple upgrades on the same room at once (#5051)	Andrew Morgan	2019-06-25	3	-52/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #4583 Does slightly less than #5045, which prevented a room from being upgraded multiple times, one after another. This PR still allows that, but just prevents two from happening at the same time. Mostly just to mitigate the fact that servers are slow and it can take a moment for the room upgrade to actually complete. We don't want people sending another request to upgrade the room when really they just thought the first didn't go through.
\| * \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into develop	Richard van der Hoff	2019-06-25	5	-8/+7
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Grafana dashboard updates	Richard van der Hoff	2019-06-25	1	-1/+6814
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Add extremities graphs to grafana dashboard	Richard van der Hoff	2019-06-25	1	-23/+832
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	format json for grafana dashboard	Richard van der Hoff	2019-06-25	1	-1/+6005
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Increase default log level for docker image to INFO. (#5547)	Andrew Morgan	2020-02-14	2	-5/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Increase default log level for docker image to INFO. (#5547)	Richard van der Hoff	2019-06-25	2	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3370.
* \| \| \| \| \| \| \| \| \|	Update docker image to use Python 3.7. (#5546)	Andrew Morgan	2020-02-14	3	-3/+4
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update docker image to use Python 3.7. (#5546)	Richard van der Hoff	2019-06-25	3	-3/+4
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Python 3.7 is apparently faster than 3.6, and should be mature enough.
* \| \| \| \| \| \| \| \|	Update changelog to better expain password reset change (#5545	Andrew Morgan	2020-02-14	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update changelog to better expain password reset change (#5545) github/release-v1.0.0 release-v1.0.0	Andrew Morgan	2019-06-24	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates the v1.0.0 changelog to provide more information to those upgrading to v1.0 on why they may receive errors or find their password reset abilities have now been disabled. Helps address #5444
* \| \| \| \| \| \| \| \|	Add info about black to code_style.rst (#5537)	Andrew Morgan	2020-02-14	2	-45/+43
\|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add info about black to code_style.rst (#5537)	Andrew Morgan	2019-06-24	2	-45/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #5533 Adds information about how to install and run black on the codebase.
* \| \| \| \| \| \| \| \|	Merge pull request #5524 from matrix-org/rav/new_cmdline_options	Andrew Morgan	2020-02-14	4	-6/+43
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5524 from matrix-org/rav/new_cmdline_options	Richard van der Hoff	2019-06-24	4	-6/+43
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add --data-dir and --open-private-ports options.
\| \| * \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2019-06-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add "--open-private-ports" cmdline option	Richard van der Hoff	2019-06-24	3	-6/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is helpful when generating a config file for running synapse under docker.
\| \| * \| \| \| \| \| \| \|	Add --data-directory commandline argument	Richard van der Hoff	2019-06-24	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't necessarily want to put the data in the cwd.
* \| \| \| \| \| \| \| \| \|	Merge pull request #5523 from matrix-org/rav/arg_defaults	Andrew Morgan	2020-02-14	30	-107/+88
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #5523 from matrix-org/rav/arg_defaults	Richard van der Hoff	2019-06-24	30	-107/+88
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop conflating generated config and default config
\| \| * \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2019-06-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Don't load the generated config as the default.	Richard van der Hoff	2019-06-24	29	-94/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's too confusing.
\| \| * \| \| \| \| \| \| \|	Ensure that all config options have sensible defaults	Richard van der Hoff	2019-06-24	4	-13/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will enable us to skip the unintuitive behaviour where the generated config and default config are the same thing.
* \| \| \| \| \| \| \| \| \|	Merge pull request #5499 from matrix-org/rav/cleanup_metrics	Andrew Morgan	2020-02-14	3	-29/+53
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #5499 from matrix-org/rav/cleanup_metrics	Richard van der Hoff	2019-06-24	3	-29/+53
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanups and sanity-checking in cpu and db metrics
\| \| * \| \| \| \| \| \| \| \|	black	Richard van der Hoff	2019-06-24	1	-6/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Avoid raising exceptions in metrics	Richard van der Hoff	2019-06-24	1	-8/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sentry will catch the errors if they happen, so that should be good enough, and woun't make things explode if we hit the error condition.
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into rav/cleanup_metrics	Richard van der Hoff	2019-06-24	397	-10437/+9513
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2019-06-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Sanity-checking for metrics updates	Richard van der Hoff	2019-06-19	1	-7/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check that our clocks go forward.
\| \| * \| \| \| \| \| \| \| \| \|	Simplify PerformanceCounters.update interface	Richard van der Hoff	2019-06-19	1	-11/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	we already have the duration for the update, so may as well use it rather than passing extra params around and recalculating it.
\| \| * \| \| \| \| \| \| \| \| \|	Remove unused _get_event_counters	Richard van der Hoff	2019-06-19	1	-7/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This has been redundant since cdb3757942fefdcdc3d33b9c6d7c9e44decefd6f.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5534 from matrix-org/babolivier/federation-publicrooms	Andrew Morgan	2020-02-13	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #5534 from matrix-org/babolivier/federation-publicrooms	Brendan Abolivier	2019-06-24	6	-20/+49
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Split public rooms directory auth config in two
\| \| * \| \| \| \| \| \| \| \| \| \|	Split public rooms directory auth config in two	Brendan Abolivier	2019-06-24	6	-20/+49
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5531 from matrix-org/erikj/workers_pagination_token	Andrew Morgan	2020-02-13	3	-17/+20
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5531 from matrix-org/erikj/workers_pagination_token	Erik Johnston	2019-06-24	3	-17/+20
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|	Fix /messages on workers when no from param specified.
\| \| * \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-06-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix /messages on workers when no from param specified.	Erik Johnston	2019-06-24	2	-17/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If no `from` param is specified we calculate and use the "current token" that inlcuded typing, presence, etc. These are unused during pagination and are not available on workers, so we simply don't calculate them.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5516 from matrix-org/rav/acme_key_path	Andrew Morgan	2020-02-13	10	-12/+62
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5516 from matrix-org/rav/acme_key_path	Richard van der Hoff	2019-06-24	10	-12/+62
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|	Allow configuration of the path used for ACME account keys.
\| \| * \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2019-06-24	5	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Remove unused Config.config_dir_path attribute	Richard van der Hoff	2019-06-24	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is no longer used and only serves to confuse.
\| \| * \| \| \| \| \| \| \| \| \| \|	Allow configuration of the path used for ACME account keys.	Richard van der Hoff	2019-06-24	4	-7/+59
\| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because sticking it in the same place as the config isn't necessarily the right thing to do.
* \| \| \| \| \| \| \| \| \| \| \|	Pass config_dir_path and data_dir_path into Config.read_config. (#5522)	Andrew Morgan	2020-02-13	35	-67/+104
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Pass config_dir_path and data_dir_path into Config.read_config. (#5522)	Richard van der Hoff	2019-06-24	35	-67/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Pull config_dir_path and data_dir_path calculation out of read_config_files * Pass config_dir_path and data_dir_path into read_config
* \| \| \| \| \| \| \| \| \| \| \|	Factor acme bits out to a separate file (#5521)	Andrew Morgan	2020-02-13	3	-53/+94
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Factor acme bits out to a separate file (#5521)	Richard van der Hoff	2019-06-24	3	-53/+94
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes some of the conditional-import hoop-jumping easier.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5498 from matrix-org/rav/fix_clock_reversal	Andrew Morgan	2020-02-13	2	-6/+15
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #5498 from matrix-org/rav/fix_clock_reversal	Richard van der Hoff	2019-06-24	2	-6/+15
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use monotonic clock where possible for metrics
\| \| * \| \| \| \| \| \| \| \| \|	Use monotonic clock where possible for metrics	Richard van der Hoff	2019-06-19	2	-6/+15
\| \| \| \|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes intermittent errors observed on Apple hardware which were caused by time.clock() appearing to go backwards when called from different threads. Also fixes a bug where database activity times were logged as 1/1000 of their correct ratio due to confusion between milliseconds and seconds.
* \| \| \| \| \| \| \| \| \| \|	Drop support for cpu_affinity (#5525)	Andrew Morgan	2020-02-13	6	-74/+2
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Drop support for cpu_affinity (#5525)	Richard van der Hoff	2019-06-22	6	-74/+2
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This has no useful purpose on python3, and is generally a source of confusion.
* \| \| \| \| \| \| \| \| \|	Improve help and cmdline option names for --generate-config options (#5512)	Andrew Morgan	2020-02-13	2	-22/+29
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Improve help and cmdline option names for --generate-config options (#5512)	Richard van der Hoff	2019-06-21	2	-22/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* group the arguments together into a group * add new names "--generate-missing-config" and "--config-directory" for existing cmdline options "--generate-keys" and "--keys-dir", which better reflect their purposes.
* \| \| \| \| \| \| \| \| \|	Refactor Config parser and add some comments. (#5511)	Andrew Morgan	2020-02-13	2	-14/+36
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Refactor Config parser and add some comments. (#5511)	Richard van der Hoff	2019-06-21	2	-14/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some comments, and simplify `read_config_files`.
* \| \| \| \| \| \| \| \| \|	Improve logging when generating config files (#5510)	Andrew Morgan	2020-02-13	4	-1/+8
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Improve logging when generating config files (#5510)	Richard van der Hoff	2019-06-21	4	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it a bit clearer what's going on.
* \| \| \| \| \| \| \| \| \|	Only import jinja2 when needed (#5514)	Andrew Morgan	2020-02-13	2	-1/+3
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Only import jinja2 when needed (#5514)	Andrew Morgan	2019-06-21	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://github.com/matrix-org/synapse/issues/5431 `jinja2` was being imported even when it wasn't strictly necessary. This made it required to run Synapse, even if the functionality that required it wasn't enabled. This was causing new Synapse installations to crash on startup. Email modules are now required.
* \| \| \| \| \| \| \| \| \|	Fix "Unexpected entry in 'full_schemas'" log warning (#5509)	Andrew Morgan	2020-02-13	2	-1/+2
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix "Unexpected entry in 'full_schemas'" log warning (#5509)	Richard van der Hoff	2019-06-21	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is a README.txt which always sets off this warning, which is a bit alarming when you first start synapse. I don't think we need to warn about this.
* \| \| \| \| \| \| \| \| \|	Fix logging error when a tampered event is detected. (#5500)	Andrew Morgan	2020-02-13	2	-1/+1
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix logging error when a tampered event is detected. (#5500)	Richard van der Hoff	2019-06-21	2	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #5513 from matrix-org/erikj/fix_messages_token	Andrew Morgan	2020-02-13	2	-0/+3
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #5513 from matrix-org/erikj/fix_messages_token	Erik Johnston	2019-06-21	2	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix /messages on worker when no token supplied
\| \| * \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-06-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix /messages on worker when no token supplied	Erik Johnston	2019-06-21	1	-0/+2
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #5505 from matrix-org/erikj/messages_worker	Andrew Morgan	2020-02-13	2	-1/+2
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #5505 from matrix-org/erikj/messages_worker	Erik Johnston	2019-06-21	3	-0/+10
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \|	Support pagination API in client_reader worker
\| \| * \| \| \| \| \| \| \|	Update docs/workers.rst	Erik Johnston	2019-06-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	E_TOO_MANY_NEGATIVES Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
\| \| * \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-06-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Support pagination API in client_reader worker	Andrew Morgan	2020-02-13	2	-0/+9
\|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Support pagination API in client_reader worker	Erik Johnston	2019-06-21	2	-0/+9
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #5476 from matrix-org/erikj/histogram_extremities	Andrew Morgan	2020-02-13	0	-0/+0
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5476 from matrix-org/erikj/histogram_extremities	Erik Johnston	2019-06-21	3	-1/+37
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add metrics for length of new extremities persisted.
* \| \| \| \| \| \| \| \| \|	Improve email notification logging (#5502)	Andrew Morgan	2020-02-13	2	-1/+2
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Improve email notification logging (#5502)	Neil Johnson	2019-06-20	2	-1/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Black	Andrew Morgan	2020-02-13	2	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Black	Erik Johnston	2019-06-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-06-20	400	-10564/+9688
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/histogram_extremities
\| * \| \| \| \| \| \| \| \|	Add descriptions and remove redundant set(..)	Erik Johnston	2019-06-19	2	-4/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Run Black. (#5482)	Andrew Morgan	2020-02-13	59	-774/+877
\|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Run Black. (#5482)	Amber Brown	2019-06-20	376	-10399/+9153
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Dinsic Blacking with black==18.6b2	Andrew Morgan	2020-02-11	353	-10315/+8823
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_error	Andrew Morgan	2020-02-10	0	-0/+0
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_error	Erik Johnston	2019-06-19	2	-9/+20
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle the case of `get_missing_events` failing
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events	Andrew Morgan	2020-02-10	3	-4/+7
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events	Erik Johnston	2019-06-19	7	-1/+166
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add experimental option to reduce extremities.
\| \| * \| \| \| \| \| \| \| \| \|	Run as background process and fix comments	Erik Johnston	2019-06-19	3	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5490 from matrix-org/rav/xmlsec_in_docker	Andrew Morgan	2020-02-10	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #5490 from matrix-org/rav/xmlsec_in_docker	Richard van der Hoff	2019-06-19	2	-1/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include xmlsec in the docker image
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5493 from matrix-org/babolivier/deactivate_bg_job_typo	Andrew Morgan	2020-02-10	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5493 from matrix-org/babolivier/deactivate_bg_job_typo	Brendan Abolivier	2019-06-19	2	-1/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in deactivation background job
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix typo in deactivation background job	Brendan Abolivier	2019-06-19	2	-1/+2
\| \|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4276 from Ralith/performance-advice	Andrew Morgan	2020-02-10	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4276 from Ralith/performance-advice	Richard van der Hoff	2019-06-18	3	-7/+29
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve advice regarding poor performance
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some logging to 3pid invite sig verification (#5015)	Andrew Morgan	2020-02-10	2	-8/+39
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add some logging to 3pid invite sig verification (#5015)	David Baker	2019-06-18	2	-8/+39
\| \| \|_\|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I had to add quite a lot of logging to diagnose a problem with 3pid invites - we only logged the one failure which isn't all that informative. NB. I'm not convinced the logic of this loop is right: I think it should just accept a single valid signature from a trusted source rather than fail if any signature is invalid. Also it should probably not skip the rest of middle loop if a check fails? However, I'm deliberately not changing the logic here.
* \| \| \| \| \| \| \| \| \| \| \| \|	changelog	Andrew Morgan	2020-02-10	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2019-06-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Include xmlsec in the docker image	Andrew Morgan	2020-02-10	1	-1/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Include xmlsec in the docker image	Richard van der Hoff	2019-06-18	1	-1/+3
\| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #5467.
* \| \| \| \| \| \| \| \| \| \| \|	README.rst: fix header level	Andrew Morgan	2020-02-10	3	-7/+29
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	README.rst: fix header level	Richard van der Hoff	2019-06-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Improve advice regarding poor performance	Benjamin Saunders	2019-06-09	3	-7/+29
\| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Fix logline	Andrew Morgan	2020-02-10	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix logline	Erik Johnston	2019-06-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Andrew Morgan	2020-02-10	2	-9/+20
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/fix_get_missing_events_error
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-06-18	387	-9715/+17324
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/fix_get_missing_events_error
\| * \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-04-10	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Handle the case of `get_missing_events` failing	Erik Johnston	2019-04-10	1	-9/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently if a call to `/get_missing_events` fails we log an exception and stop processing the top level event we received over federation. Instead let's try and handle it sensibly given it is a somewhat expected failure mode.
* \| \| \| \| \| \| \| \| \| \|	Newsfile	Andrew Morgan	2020-02-10	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-06-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Add experimental option to reduce extremities.	Andrew Morgan	2020-02-10	6	-1/+162
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add experimental option to reduce extremities.	Erik Johnston	2019-06-18	6	-1/+162
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds new config option `cleanup_extremities_with_dummy_events` which periodically sends dummy events to rooms with more than 10 extremities. THIS IS REALLY EXPERIMENTAL.
* \| \| \| \| \| \| \| \| \| \|	Only count non-cache state resolution	Andrew Morgan	2020-02-10	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Only count non-cache state resolution	Erik Johnston	2019-06-18	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Use consistent buckets	Andrew Morgan	2020-02-10	3	-1/+34
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use consistent buckets	Erik Johnston	2019-06-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-06-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add metric fo number of state groups in resolution	Erik Johnston	2019-06-17	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add metrics for len of new extremities persisted.	Erik Johnston	2019-06-17	1	-1/+23
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Of new events being persisted add metrics for total size of forward extremities and number of unchanged, "stale" extremities.
* \| \| \| \| \| \| \| \| \|	Fix seven contrib files with Python syntax errors (#5446)	Andrew Morgan	2020-02-10	7	-119/+131
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix seven contrib files with Python syntax errors (#5446)	cclauss	2019-06-18	7	-119/+131
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix seven contrib files with Python syntax errors Signed-off-by: cclauss <cclauss@me.com>
* \| \| \| \| \| \| \| \| \|	Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pid	Andrew Morgan	2020-02-10	1	-0/+9
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pid	Brendan Abolivier	2019-06-17	3	-1/+43
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add third party rules hook for 3PID invites
\| \| * \| \| \| \| \| \| \| \|	Make check_threepid_can_be_invited async	Brendan Abolivier	2019-06-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Changelog	Brendan Abolivier	2019-06-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Add third party rules hook for 3PID invites	Brendan Abolivier	2019-06-17	2	-1/+41
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5479 from matrix-org/erikj/add_create_room_hook_develop	Andrew Morgan	2020-02-10	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #5479 from matrix-org/erikj/add_create_room_hook_develop	Erik Johnston	2019-06-17	3	-4/+49
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add third party rules hook into create room
\| \| * \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-06-17	1	-0/+1
\| \| \|/ / / / / / / / /
\| \| * / / / / / / / /	Add third party rules hook into create room	Erik Johnston	2019-06-17	2	-4/+48
\| \| \|/ / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #5478 from matrix-org/joriks/demo_python3	Andrew Morgan	2020-02-10	1	-0/+1
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #5478 from matrix-org/joriks/demo_python3	Jorik Schellekens	2019-06-17	3	-4/+71
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Joriks/demo python3
\| \| * \| \| \| \| \| \| \| \|	Changelog	Jorik Schellekens	2019-06-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|