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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \|	Fix media repo breaking (#5593)	Amber Brown	2019-07-02	3	-12/+24
\| \| \| \| \|
* \| \| \| \|	prepare v1.1.0rc1	Andrew Morgan	2020-02-14	1	-1/+1
\|\\| \| \| \|
\| * \| \| \|	prepare v1.1.0rc1	Richard van der Hoff	2019-07-02	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Complete the SAML2 implementation (#5422)	Andrew Morgan	2020-02-14	5	-44/+209
\|\\| \| \| \|
\| * \| \| \|	Complete the SAML2 implementation (#5422)	Richard van der Hoff	2019-07-02	5	-44/+209
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	22	-205/+303
\| \| \|\ \ \ \
\| \| * \| \| \| \|	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
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	cleanups	Richard van der Hoff	2019-06-27	3	-11/+18
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	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	304	-9516/+9216
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge tag 'v1.0.0rc3' into rav/saml2_client	Richard van der Hoff	2019-06-11	4	-2/+7
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	85	-861/+4648
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	SAML2 Improvements and redirect stuff	Alexander Trost	2019-06-02	5	-2/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Alexander Trost <galexrt@googlemail.com>
* \| \| \| \| \| \| \| \| \|	Fix JWT login with new users (#5586)	Andrew Morgan	2020-02-14	1	-6/+3
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix JWT login with new users (#5586)	PauRE	2019-07-02	1	-6/+3
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
* \| \| \| \| \| \| \| \|	fix async/await consentresource (#5585)	Andrew Morgan	2020-02-14	1	-1/+3
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix async/await consentresource (#5585)	Amber Brown	2019-07-01	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #5582
* \| \| \| \| \| \| \| \|	Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloop	Andrew Morgan	2020-02-14	1	-2/+19
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloop	Erik Johnston	2019-07-01	1	-2/+19
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|	Fix sync tightloop bug.
\| \| * \| \| \| \| \| \|	Fixup comment	Erik Johnston	2019-07-01	1	-6/+13
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	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	9	-156/+114
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Make the http server handle coroutine-making REST servlets (#5475)	Amber Brown	2019-06-29	9	-156/+114
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimit	Brendan Abolivier	2019-06-28	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| \| * \| \| \| \| \| \| \|	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	1	-1/+4
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Don't log GC 0s at INFO (#5557)	Amber Brown	2019-06-28	1	-1/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Update the TLS cipher string and provide configurability for TLS on outgoing ↵	Andrew Morgan	2020-02-14	2	-7/+64
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	federation (#5550)
\| * \| \| \| \| \| \| \|	Update the TLS cipher string and provide configurability for TLS on outgoing ↵	Amber Brown	2019-06-28	2	-7/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	federation (#5550)
* \| \| \| \| \| \| \| \|	Added possibilty to disable local password authentication (#5092)	Andrew Morgan	2020-02-14	3	-1/+11
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added possibilty to disable local password authentication (#5092)	Daniel Hoffend	2019-06-27	3	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Daniel Hoffend <dh@dotlan.net>
* \| \| \| \| \| \| \| \|	Make it clearer that the template dir is relative to synapse's root dir (#5543)	Andrew Morgan	2020-02-14	1	-1/+9
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Make it clearer that the template dir is relative to synapse's root dir (#5543)	Andrew Morgan	2019-06-27	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Helps address #5444
* \| \| \| \| \| \| \| \|	Merge pull request #5559 from matrix-org/erikj/refactor_changed_devices	Andrew Morgan	2020-02-14	3	-37/+97
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5559 from matrix-org/erikj/refactor_changed_devices	Erik Johnston	2019-06-27	3	-37/+97
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|	Refactor devices changed query to pull less from DB
\| \| * \| \| \| \| \| \|	Review comments	Erik Johnston	2019-06-27	2	-7/+5
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	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
* \| \| \| \| \| \| \|	Fix JWT login (#5555)	Andrew Morgan	2020-02-14	2	-1/+2
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix JWT login (#5555)	PauRE	2019-06-27	2	-1/+2
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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>
* \| \| \| \| \| \|	Prevent multiple upgrades on the same room at once (#5051)	Andrew Morgan	2020-02-14	2	-52/+90
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Prevent multiple upgrades on the same room at once (#5051)	Andrew Morgan	2019-06-25	2	-52/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 pull request #5524 from matrix-org/rav/new_cmdline_options	Andrew Morgan	2020-02-14	2	-5/+41
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #5524 from matrix-org/rav/new_cmdline_options	Richard van der Hoff	2019-06-24	2	-5/+41
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add --data-dir and --open-private-ports options.
\| \| * \| \| \| \| \|	Add "--open-private-ports" cmdline option	Richard van der Hoff	2019-06-24	2	-5/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	29	-107/+87
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #5523 from matrix-org/rav/arg_defaults	Richard van der Hoff	2019-06-24	29	-107/+87
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop conflating generated config and default config
\| \| * \| \| \| \| \|	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	2	-29/+52
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #5499 from matrix-org/rav/cleanup_metrics	Richard van der Hoff	2019-06-24	2	-29/+52
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	291	-9106/+8018
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	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	Brendan Abolivier	2019-06-24	3	-15/+39
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Split public rooms directory auth config in two
\| \| * \| \| \| \| \| \| \| \|	Split public rooms directory auth config in two	Brendan Abolivier	2019-06-24	3	-15/+39
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5531 from matrix-org/erikj/workers_pagination_token	Andrew Morgan	2020-02-13	2	-17/+19
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #5531 from matrix-org/erikj/workers_pagination_token	Erik Johnston	2019-06-24	2	-17/+19
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|	Fix /messages on workers when no from param specified.
\| \| * \| \| \| \| \| \| \| \|	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	4	-10/+52
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	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	3	-7/+52
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	30	-63/+99
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Pass config_dir_path and data_dir_path into Config.read_config. (#5522)	Richard van der Hoff	2019-06-24	30	-63/+99
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	2	-53/+93
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Factor acme bits out to a separate file (#5521)	Richard van der Hoff	2019-06-24	2	-53/+93
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-6/+14
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5498 from matrix-org/rav/fix_clock_reversal	Richard van der Hoff	2019-06-24	1	-6/+14
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use monotonic clock where possible for metrics
\| \| * \| \| \| \| \| \| \|	Use monotonic clock where possible for metrics	Richard van der Hoff	2019-06-19	1	-6/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-51/+1
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Drop support for cpu_affinity (#5525)	Richard van der Hoff	2019-06-22	4	-51/+1
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-22/+28
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Improve help and cmdline option names for --generate-config options (#5512)	Richard van der Hoff	2019-06-21	1	-22/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	1	-14/+35
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Refactor Config parser and add some comments. (#5511)	Richard van der Hoff	2019-06-21	1	-14/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some comments, and simplify `read_config_files`.
* \| \| \| \| \| \| \| \|	Improve logging when generating config files (#5510)	Andrew Morgan	2020-02-13	3	-1/+7
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Improve logging when generating config files (#5510)	Richard van der Hoff	2019-06-21	3	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it a bit clearer what's going on.
* \| \| \| \| \| \| \| \|	Only import jinja2 when needed (#5514)	Andrew Morgan	2020-02-13	1	-1/+2
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Only import jinja2 when needed (#5514)	Andrew Morgan	2019-06-21	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix "Unexpected entry in 'full_schemas'" log warning (#5509)	Richard van der Hoff	2019-06-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+0
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix logging error when a tampered event is detected. (#5500)	Richard van der Hoff	2019-06-21	1	-1/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5513 from matrix-org/erikj/fix_messages_token	Andrew Morgan	2020-02-13	1	-0/+2
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix /messages on worker when no token supplied	Erik Johnston	2019-06-21	1	-0/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Support pagination API in client_reader worker	Andrew Morgan	2020-02-13	1	-0/+2
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Support pagination API in client_reader worker	Erik Johnston	2019-06-21	1	-0/+2
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #5476 from matrix-org/erikj/histogram_extremities	Erik Johnston	2019-06-21	2	-1/+36
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add metrics for length of new extremities persisted.
* \| \| \| \| \| \| \| \|	Improve email notification logging (#5502)	Andrew Morgan	2020-02-13	1	-1/+1
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Improve email notification logging (#5502)	Neil Johnson	2019-06-20	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	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	292	-9079/+7986
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	17	-62/+64
\|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Run Black. (#5482)	Amber Brown	2019-06-20	291	-9076/+7753
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_error	Erik Johnston	2019-06-19	1	-9/+19
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle the case of `get_missing_events` failing
* \| \| \| \| \| \| \| \| \|	Dinsic Blacking with black==18.6b2	Andrew Morgan	2020-02-11	295	-9336/+8020
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events	Andrew Morgan	2020-02-10	2	-3/+6
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events	Erik Johnston	2019-06-19	5	-1/+124
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add experimental option to reduce extremities.
\| \| * \| \| \| \| \| \| \| \|	Run as background process and fix comments	Erik Johnston	2019-06-19	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix typo in deactivation background job	Brendan Abolivier	2019-06-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Add some logging to 3pid invite sig verification (#5015)	Andrew Morgan	2020-02-10	1	-8/+38
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add some logging to 3pid invite sig verification (#5015)	David Baker	2019-06-18	1	-8/+38
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \| \|	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	1	-9/+19
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/fix_get_missing_events_error
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-06-18	171	-2326/+11195
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/fix_get_missing_events_error
\| * \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \| \|	Add experimental option to reduce extremities.	Andrew Morgan	2020-02-10	5	-1/+121
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add experimental option to reduce extremities.	Erik Johnston	2019-06-18	5	-1/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-1/+33
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use consistent buckets	Erik Johnston	2019-06-18	1	-1/+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.
* \| \| \| \| \| \| \| \|	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	2	-1/+42
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add third party rules hook for 3PID invites
\| \| * \| \| \| \| \| \| \|	Make check_threepid_can_be_invited async	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	Erik Johnston	2019-06-17	2	-4/+48
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add third party rules hook into create room
\| \| * \| \| \| \| \| \| \|	Add third party rules hook into create room	Erik Johnston	2019-06-17	2	-4/+48
\| \| \|/ / / / / / /
* \| \| \| \| \| \| \| \|	Remove Postgres 9.4 support (#5448)	Andrew Morgan	2020-02-10	2	-24/+6
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove Postgres 9.4 support (#5448)	Amber Brown	2019-06-18	2	-24/+6
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptions	Andrew Morgan	2020-02-10	4	-19/+28
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptions	Erik Johnston	2019-06-17	4	-19/+28
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle HttpResponseException when using federation client.
\| \| * \| \| \| \| \| \|	Handle failing to talk to master over replication	Erik Johnston	2019-06-07	1	-1/+9
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Handle HttpResponseException when using federation client.	Erik Johnston	2019-06-07	3	-18/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise we just log exceptions everywhere.
* \| \| \| \| \| \| \| \|	Merge commit 'dd927b29e' into dinsic-release-v1.1.0	Andrew Morgan	2020-02-10	3	-7/+53
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5388 from matrix-org/erikj/fix_email_push	Erik Johnston	2019-06-17	3	-7/+53
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix email notifications for unnamed rooms with multiple people
\| \| * \| \| \| \| \| \| \|	Add test	Erik Johnston	2019-06-07	2	-7/+42
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix email notifications for large unnamed rooms.	Erik Johnston	2019-06-07	1	-0/+11
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we try and calculate a description for a room for with no name but multiple other users we threw an exception (due to trying to subscript result of `dict.values()`).
* \| \| \| \| \| \| \| \|	Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_master	Andrew Morgan	2020-02-10	1	-3/+4
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_master	Erik Johnston	2019-06-17	1	-3/+4
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only start background group attestation renewals on master
\| \| * \| \| \| \| \| \| \|	Only start background group attestation renewals on master	Erik Johnston	2019-06-07	1	-3/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_state	Erik Johnston	2019-06-17	1	-6/+0
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 3PID invite room state over federation.
\| * \ \ \ \ \ \ \ \ \	Merge pull request #5440 from matrix-org/babolivier/third_party_event_rules	Brendan Abolivier	2019-06-14	6	-4/+191
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow server admins to define implementations of extra rules for allowing or denying incoming events
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitive	Andrew Morgan	2020-02-10	2	-2/+2
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitive	Erik Johnston	2019-06-14	2	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prometheus histograms are cumalative
\| \| * \| \| \| \| \| \| \| \| \| \|	Prometheus histograms are cumalative	Erik Johnston	2019-06-14	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_job	Brendan Abolivier	2019-06-14	1	-2/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix background job for deactivated flag
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix background job for deactivated flag	Brendan Abolivier	2019-06-14	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5462 from ↵	Brendan Abolivier	2019-06-14	4	-2/+25
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/babolivier/account_validity_deactivated_accounts_2 Don't send renewal emails to deactivated users (second attempt)
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0	Andrew Morgan	2020-02-10	33	-130/+989
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix resetting password via a phone number (#21) dinsic_2020-02-10	Andrew Morgan	2020-01-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Validate client_secret parameter according to spec (#20)	Andrew Morgan	2020-01-22	3	-1/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add the ability to restrict max avatar filesize and content-type (#19)	Andrew Morgan	2019-12-12	3	-2/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add limit_profile_requests_to_known_users option (#18)	Andrew Morgan	2019-12-05	2	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Capatilise letters after a - in new user displaynames (#14)	Andrew Morgan	2019-12-02	1	-16/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Discard retention policies when retrieving state	Brendan Abolivier	2019-11-29	2	-7/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Purge jobs don't delete the latest event in a room in order to keep the forward extremity and not break the room. On the other hand, get_state_events, when given an at_token argument calls filter_events_for_client to know if the user can see the event that matches that (sync) token. That function uses the retention policies of the events it's given to filter out those that are too old from a client's view. Some clients, such as Riot, when loading a room, request the list of members for the latest sync token it knows about, and get confused to the point of refusing to send any message if the server tells it that it can't get that information. This can happen very easily with the message retention feature turned on and a room with low activity so that the last event sent becomes too old according to the room's retention policy. An easy and clean fix for that issue is to discard the room's retention policies when retrieving state.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Hide expired users from user directory, optionally show on renewal (#13)	Andrew Morgan	2019-11-14	2	-0/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add a /user/:user_id/info servlet to give user deactivated/expired ↵	Andrew Morgan	2019-11-14	2	-6/+92
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	information (#12)
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Create configurable ratelimiter for 3pid invites (#11)	Andrew Morgan	2019-11-12	2	-8/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Don't apply retention policy based filtering on state events	Brendan Abolivier	2019-11-06	1	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Support for routing outbound HTTP requests via a proxy (#6239)	Richard van der Hoff	2019-11-01	10	-9/+430
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `http_proxy` and `HTTPS_PROXY` env vars can be set to a `host[:port]` value which should point to a proxy. The address of the proxy should be excluded from IP blacklists such as the `url_preview_ip_range_blacklist`. The proxy will then be used for * push * url previews * phone-home stats * recaptcha validation * CAS auth validation It will not be used for: * Application Services * Identity servers * Outbound federation * In worker configurations, connections from workers to masters Fixes #4198.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Typo	Brendan Abolivier	2019-10-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-10-04	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Incorporate review	Brendan Abolivier	2019-10-04	1	-14/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add test case	Brendan Abolivier	2019-10-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-10-04	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Don't 500 code when trying to exchange a revoked 3PID invite	Brendan Abolivier	2019-10-04	1	-2/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While this is not documented in the spec (but should be), Riot (and other clients) revoke 3PID invites by sending a m.room.third_party_invite event with an empty ({}) content to the room's state. When the invited 3PID gets associated with a MXID, the identity server (which doesn't know about revocations) sends down to the MXID's homeserver all of the undelivered invites it has for this 3PID. The homeserver then tries to talk to the inviting homeserver in order to exchange these invite for m.room.member events. When one of the invite is revoked, the inviting homeserver responds with a 500 error because it tries to extract a 'display_name' property from the content, which is empty. This might cause the invited server to consider that the server is down and not try to exchange other, valid invites (or at least delay it). This fix handles the case of revoked invites by avoiding trying to fetch a 'display_name' from the original invite's content, and letting the m.room.member event fail the auth rules (because, since the original invite's content is empty, it doesn't have public keys), which results in sending a 403 with the correct error message to the invited server.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #7 from matrix-org/babolivier/deactivation-invite	Brendan Abolivier	2019-09-27	1	-0/+37
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reject pending invites on deactivation
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	s/return/defer.returnValue/	Brendan Abolivier	2019-09-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Incorporate review	Brendan Abolivier	2019-09-27	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Update synapse/handlers/deactivate_account.py	Brendan Abolivier	2019-09-27	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Update synapse/handlers/deactivate_account.py	Brendan Abolivier	2019-09-27	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-09-27	1	-1/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow membership events which membership isn't join or invite in restricted ↵	Brendan Abolivier	2019-09-26	1	-1/+9
\| \|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rooms
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Consider every room as having no retention policy if the feature is disabled	Brendan Abolivier	2019-09-24	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Move get_retention_policy_for_room to RoomWorkerStore	Brendan Abolivier	2019-09-24	1	-55/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary cast to list	Brendan Abolivier	2019-09-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-09-19	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Use six.moves.filter when filtering out from MXID	Brendan Abolivier	2019-09-19	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Python 2's filter() function and Python 3's don't return the same type when processing a string (respectively str and filter), therefore use six's compatibility mapping (which resolves to itertools.ifilter() if using Python2), then generate a string from the filtered list, in order to ensure consistent behaviour between Python 2 and Python 3.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2 from matrix-org/babolivier/dinsic-3pid-invite	Brendan Abolivier	2019-09-10	1	-9/+14
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't treat 3PID revocation as a new 3PID invite
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Process revocations in _on_membership_or_invite_direct	Brendan Abolivier	2019-09-09	1	-18/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Typo	Brendan Abolivier	2019-09-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Only filter on 3PID invite tokens	Brendan Abolivier	2019-09-06	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dinsic' into babolivier/dinsic-3pid-invite	Brendan Abolivier	2019-09-06	1	-0/+48
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't process revoked/redacted events as part of the room's membership info	Brendan Abolivier	2019-09-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't treat 3PID revokation as a new 3PID invite	Brendan Abolivier	2019-09-06	1	-7/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename io.open import to limite side-effects	Brendan Abolivier	2019-09-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-09-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge pull request #5932 from ↵	Brendan Abolivier	2019-09-09	2	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/babolivier/account_validity_template_encode" This reverts commit 84e695f506faf54982b9e19dceb9c02acffad95f, reversing changes made to 99eec6d2d5cc76e645c3fd7ca6cda85b2bab6feb.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Read all files as UTF-8	Brendan Abolivier	2019-09-09	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Ensure the password reset template is correctly converted to binary"	Brendan Abolivier	2019-09-09	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 665dd9f7f8db2f8d38f454d4d5b96efcf163a5db.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure the password reset template is correctly converted to binary	Brendan Abolivier	2019-09-09	1	-1/+2
\| \| \|/ / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Regardless of the Python version
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-09-05	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Forbid changing the name, avatar or topic of a direct room	Brendan Abolivier	2019-09-05	1	-0/+50
\| \|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't send renewal emails to deactivated users	Andrew Morgan	2020-02-10	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Don't send renewal emails to deactivated users	Brendan Abolivier	2019-06-14	4	-2/+25
\| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_file	Andrew Morgan	2020-02-10	2	-6/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_file	Erik Johnston	2019-06-14	2	-6/+13
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|	Don't log exception when failing to fetch remote content.
\| \| * \| \| \| \| \| \| \| \| \| \|	Don't log exception when failing to fetch remote content.	Erik Johnston	2019-06-07	2	-6/+13
\| \| \| \|_\|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In particular, let's not log stack traces when we stop processing becuase the response body was too large.
* \| \| \| \| \| \| \| \| \| \| \|	Track deactivated accounts in the database (#5378)	Andrew Morgan	2020-02-10	1	-0/+3
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Track deactivated accounts in the database (#5378)	Brendan Abolivier	2019-06-14	3	-0/+137
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5458 from matrix-org/hawkowl/fix-prometheus	Andrew Morgan	2020-02-10	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	fix prometheus rendering error	Amber H. Brown	2019-06-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Clean up code for sending federation EDUs. (#5381)	Andrew Morgan	2020-02-10	1	-14/+26
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Clean up code for sending federation EDUs. (#5381)	Richard van der Hoff	2019-06-13	1	-14/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This code confused the hell out of me today. Split _get_new_device_messages into its two (unrelated) parts.
* \| \| \| \| \| \| \| \| \| \| \|	Expose statistics on extrems to prometheus (#5384)	Andrew Morgan	2020-02-10	2	-33/+123
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Expose statistics on extrems to prometheus (#5384)	Amber Brown	2019-06-13	2	-33/+123
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Remove Python 2.7 support. (#5425)	Andrew Morgan	2020-02-10	6	-27/+59
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove Python 2.7 support. (#5425)	Amber Brown	2019-06-12	2	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remove 2.7 from CI and publishing * fill out classifiers and also make it not be installed on 3.5 * some minor bumps so that the old deps work on python 3.5
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2019-06-11	6	-9/+9
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2019-06-11	4	-2/+7
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't warn user about password reset disabling through config code (#5387)	Andrew Morgan	2019-06-11	2	-10/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves the warning about password resets being disabled to the point where a user actually tries to reset their password. Is this an appropriate place for it to happen? Also removed the disabling of msisdn password resets when you don't have an email config, as that just doesn't make sense. Also change the error a user receives upon disabled passwords to specify that only email-based password reset is disabled.
\| * \| \| \| \| \| \| \| \| \|	add monthly active users to phonehome stats (#5252)	Neil Johnson	2019-06-10	2	-15/+30
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add monthly active users to phonehome stats
\| * \| \| \| \| \| \| \| \|	Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2019-06-10	5	-87/+134
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_ms	Erik Johnston	2019-06-10	1	-0/+8
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix key verification when key stored with null valid_until_ms
\| * \ \ \ \ \ \ \ \ \ \	Merge pull request #5363 from ↵	Brendan Abolivier	2019-06-10	2	-3/+14
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/babolivier/account_validity_send_mail_auth Don't check whether the user's account is expired on /send_mail requests
* \| \| \| \| \| \| \| \| \| \| \|	Bump requirement for six to 1.12	Brendan Abolivier	2019-08-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Fix encoding for account validity HTML files on Python 2	Brendan Abolivier	2019-08-29	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dinsic' into babolivier/dinsic-message-retention	Brendan Abolivier	2019-08-28	8	-42/+190
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge pull request #5812 from matrix-org/babolivier/account-validity-messages dinsic_2019-08-12	Michael Kaye	2019-08-12	5	-9/+69
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Account validity: allow defining HTML templates to serve the user on account renewal attempt
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-08-01	2	-13/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Allow defining HTML templates to serve the user on account renewal	Brendan Abolivier	2019-08-01	5	-9/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5781 from matrix-org/baboliver/loopingcall-args dinsic_2019-08-08	Michael Kaye	2019-08-08	1	-2/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ability to pass arguments to looping calls
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Add kwargs and doc	Brendan Abolivier	2019-07-29	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Add ability to pass arguments to looping calls	Brendan Abolivier	2019-07-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5760 from ↵	Michael Kaye	2019-08-08	1	-14/+85
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/babolivier/access-rules-public-restricted Force the access rule to be "restricted" if the join rule is "public"
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Explain rationale	Brendan Abolivier	2019-08-01	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Incorporate review	Brendan Abolivier	2019-07-30	1	-15/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge ifs	Brendan Abolivier	2019-07-25	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Doc	Brendan Abolivier	2019-07-25	1	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Only check the join rule on room creation if an access rule is also provided	Brendan Abolivier	2019-07-25	1	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Implement restrictions on new events	Brendan Abolivier	2019-07-24	1	-1/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Implement restriction on public room creation	Brendan Abolivier	2019-07-24	1	-11/+30
\| \| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Ignore redactions of redactions in get_events_as_list	Brendan Abolivier	2019-07-31	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Ignore invalid redactions in _get_event_from_row	Brendan Abolivier	2019-07-31	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Should now work, unless we can't find the redaction event which happens for ↵	Brendan Abolivier	2019-07-30	1	-18/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	some reason (need to investigate)
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Don't make the checks depend on recheck_redaction	Brendan Abolivier	2019-07-30	1	-20/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Do checks sooner	Brendan Abolivier	2019-07-29	1	-21/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Check room ID and type of redacted event	Brendan Abolivier	2019-07-29	1	-10/+22
\| \|/ / / / / / / / / / / /
* / / / / / / / / / / / /	Implement per-room message retention policies	Brendan Abolivier	2019-08-28	10	-7/+689
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dinsic' into babolivier/3pid-invite	Brendan Abolivier	2019-07-17	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge pull request #5646 from matrix-org/babolivier/profile-allow-self dinsic_2019-07-09	Brendan Abolivier	2019-07-09	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port #5644 to dinsic
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Allow newly-registered users to lookup their own profiles	Brendan Abolivier	2019-07-09	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a user creates an account and the 'require_auth_for_profile_requests' config flag is set, and a client that performed the registration wants to lookup the newly-created profile, the request will be denied because the user doesn't share a room with themselves yet.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	There's no third_party_signed property in an invite's content	Brendan Abolivier	2019-07-17	1	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|