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

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \| \| \| \|	improve human readable error message	Neil Johnson	2018-09-04	1	-1/+2
\| * \| \| \| \|	improve human readable error messages	Neil Johnson	2018-09-04	2	-7/+20
* \| \| \| \| \|	Fix tests on postgresql (#3740)	Amber Brown	2018-09-04	18	-341/+356
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_func	Erik Johnston	2018-09-03	4	-57/+8
\|\ \ \ \ \
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-09-03	1	-0/+1
\| * \| \| \| \|	Remove unnecessary resolve_events_with_state_map	Erik Johnston	2018-08-22	3	-57/+7
* \| \| \| \| \|	Merge pull request #3378 from NickEckardt/develop	Amber Brown	2018-09-03	2	-5/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	Create 3378.misc	Amber Brown	2018-09-03	1	-0/+1
\| * \| \| \| \|	Merge branch 'develop' into develop	Amber Brown	2018-09-03	441	-11570/+24237
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3777 from matrix-org/neilj/fix_register_user_registration	Neil Johnson	2018-08-31	9	-5/+78
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	assert rather than warn hhs-4	Neil Johnson	2018-08-31	1	-3/+2
\| * \| \| \| \|	move threepid checker to config, add missing yields	Neil Johnson	2018-08-31	6	-21/+41
\| * \| \| \| \|	fix reference to is_threepid_reserved	Neil Johnson	2018-08-31	1	-1/+1
\| * \| \| \| \|	typo	Neil Johnson	2018-08-31	1	-1/+1
\| * \| \| \| \|	ensure post registration auth checks do not fail erroneously	Neil Johnson	2018-08-31	4	-6/+24
\| * \| \| \| \|	news fragemnt	Neil Johnson	2018-08-31	1	-0/+1
\| * \| \| \| \|	fix bug where preserved threepid user comes to sign up and server is mau blocked	Neil Johnson	2018-08-31	5	-3/+38
\|/ / / / /
* \| \| \| \|	Port storage/ to Python 3 (#3725)	Amber Brown	2018-08-31	17	-36/+208
* \| \| \| \|	Merge pull request #3764 from matrix-org/rav/close_db_conn_after_init	Richard van der Hoff	2018-08-30	16	-54/+41
\|\ \ \ \ \
\| * \| \| \| \|	Fix up tests	Richard van der Hoff	2018-08-28	3	-6/+10
\| * \| \| \| \|	use abc.abstractproperty	Richard van der Hoff	2018-08-28	1	-5/+4
\| * \| \| \| \|	changelog	Richard van der Hoff	2018-08-28	1	-0/+1
\| * \| \| \| \|	Make sure that we close db connections opened during init	Richard van der Hoff	2018-08-28	12	-48/+31
* \| \| \| \| \|	Merge pull request #3768 from krombel/fix_3445	Erik Johnston	2018-08-29	2	-2/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	changelog	Krombel	2018-08-29	2	-1/+1
\| * \| \| \| \| \|	fix #3445	Krombel	2018-08-29	2	-2/+3
\|/ / / / / /
* \| \| \| \| \|	Update CONTRIBUTING to clarify miscs & Markdown (#3730)	Amber Brown	2018-08-29	2	-3/+5
* \| \| \| \| \|	don't return non-LL-member state in incremental sync state blocks (#3760)	Matthew Hodgson	2018-08-28	2	-1/+9
\|/ / / / /
* \| \| \| \|	Merge pull request #3758 from matrix-org/erikj/admin_contact hhs-3	Erik Johnston	2018-08-24	8	-13/+14
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact	Erik Johnston	2018-08-24	3	-4/+5
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3756 from matrix-org/erikj/fix_tags_server_notices	Erik Johnston	2018-08-24	3	-4/+5
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-24	1	-0/+1
\| * \| \| \| \| \|	Fix checking if service notice room is already tagged	Erik Johnston	2018-08-24	2	-4/+4
\|/ / / / / /
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-08-24	1	-0/+1
\| * \| \| \| \|	Change admin_uri to admin_contact in config and errors	Erik Johnston	2018-08-24	7	-13/+13
\|/ / / / /
* \| \| \| \|	Merge pull request #3755 from matrix-org/erikj/fix_server_notice_tags hhs-2	Erik Johnston	2018-08-24	3	-4/+16
\|\ \ \ \ \
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-08-24	1	-0/+1
\| * \| \| \| \|	Ensure we wake up /sync when we add tag to notice room	Erik Johnston	2018-08-24	2	-2/+13
\| * \| \| \| \|	Make content of tag an empty object rather than null	Erik Johnston	2018-08-24	2	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #3754 from matrix-org/erikj/fix_whitelist hhs-1	Erik Johnston	2018-08-24	2	-1/+2
\|\ \ \ \ \
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-08-24	1	-0/+1
\| * \| \| \| \|	Fix bug when federation_domain_whitelist is an emtpy list	Erik Johnston	2018-08-24	1	-1/+1
* \| \| \| \| \|	Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticse	Erik Johnston	2018-08-24	2	-0/+5
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-24	1	-0/+1
\| * \| \| \| \| \|	Fix bug where we broke sync when using limit_usage_by_mau	Erik Johnston	2018-08-24	1	-0/+4
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #3751 from matrix-org/rav/twisted_17	Richard van der Hoff	2018-08-24	2	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	changelog	Richard van der Hoff	2018-08-24	1	-0/+1
\| * \| \| \| \|	Pin to twisted 17.1 or later	Richard van der Hoff	2018-08-24	1	-1/+1
* \| \| \| \| \|	Merge pull request #3749 from matrix-org/erikj/add_trial_users	Erik Johnston	2018-08-24	8	-5/+272
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-08-23	1	-0/+1
\| * \| \| \| \|	Unit tests	Erik Johnston	2018-08-23	2	-3/+227
\| * \| \| \| \|	Implement trail users	Erik Johnston	2018-08-23	5	-2/+44
\|/ / / / /
* \| \| \| \|	Merge pull request #3747 from matrix-org/erikj/fix_multiple_sends_notice	Erik Johnston	2018-08-23	3	-1/+72
\|\ \ \ \ \
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-08-23	1	-0/+1
\| * \| \| \| \|	Fix bug where we resent "limit exceeded" server notices	Erik Johnston	2018-08-23	2	-1/+71
\|/ / / / /
* \| \| \| \|	Merge pull request #3734 from matrix-org/travis/worker-docs	Travis Ralston	2018-08-23	2	-1/+2
\|\ \ \ \ \
\| * \| \| \| \|	Create 3734.misc	Travis Ralston	2018-08-21	1	-0/+1
\| * \| \| \| \|	Reference that the federation_reader needs the HTTP replication port set	Travis Ralston	2018-08-21	1	-1/+1
* \| \| \| \| \|	Merge pull request #3746 from matrix-org/erikj/mau_fixups	Erik Johnston	2018-08-23	3	-1/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-23	1	-0/+1
\| * \| \| \| \| \|	Actually run the tests	Erik Johnston	2018-08-23	1	-0/+0
\| * \| \| \| \| \|	Add missing yield	Erik Johnston	2018-08-23	1	-1/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #3680 from matrix-org/neilj/server_notices_on_blocking	Erik Johnston	2018-08-22	10	-32/+408
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...	Erik Johnston	2018-08-22	116	-764/+1624
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2018-08-22	3	-4/+12
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Use recaptcha_ajax.js directly from Google	Richard van der Hoff	2018-08-22	2	-196/+1
\| * \| \| \| \|	Merge tag 'v0.33.3'	Richard van der Hoff	2018-08-22	200	-3529/+5653
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| * \| \| \|	changelog for 0.33.3 v0.33.3 github/release-v0.33.3 release-v0.33.3	Richard van der Hoff	2018-08-22	2	-1/+9
\| \| * \| \| \|	bump version to 0.33.3	Richard van der Hoff	2018-08-22	1	-1/+1
\| \| * \| \| \|	Update attributions and PR links in changelog	Richard van der Hoff	2018-08-22	1	-2/+2
\| * \| \| \| \|	Merge pull request #3685 from matrix-org/revert-3677-master	Richard van der Hoff	2018-08-13	3	-2/+196
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Revert "Use recaptcha_ajax.js directly from Google"	Richard van der Hoff	2018-08-13	3	-2/+196
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #3677 from andrewshadura/master	Richard van der Hoff	2018-08-13	3	-196/+2
\| \|\ \ \ \ \
* \| \ \ \ \ \	Merge pull request #3724 from Half-Shot/hs/guest-fetch-event	Erik Johnston	2018-08-22	2	-1/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	3724.feature	Will Hunt	2018-08-20	1	-0/+1
\| * \| \| \| \| \| \|	Allow guests to access /rooms/:roomId/event/:eventId	Will Hunt	2018-08-20	1	-1/+1
* \| \| \| \| \| \| \|	Merge pull request #3659 from matrix-org/erikj/split_profiles	Erik Johnston	2018-08-22	9	-44/+78
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Rename WorkerProfileHandler to BaseProfileHandler	Erik Johnston	2018-08-22	2	-5/+12
\| * \| \| \| \| \| \| \|	Add assert to ensure handler is only run on master	Erik Johnston	2018-08-22	1	-0/+2
\| * \| \| \| \| \| \| \|	Remove redundant vars	Erik Johnston	2018-08-22	1	-3/+0
\| * \| \| \| \| \| \| \|	Add some fixmes	Erik Johnston	2018-08-17	2	-0/+6
\| * \| \| \| \| \| \| \|	Call UserDirectoryHandler methods directly	Erik Johnston	2018-08-17	4	-104/+8
\| * \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...	Erik Johnston	2018-08-17	244	-2980/+3681
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Split ProfileHandler into master and worker	Erik Johnston	2018-08-17	3	-11/+21
\| * \| \| \| \| \| \| \| \|	Remote profile cache should remain in master worker	Erik Johnston	2018-08-17	1	-4/+2
\| * \| \| \| \| \| \| \| \|	Docstrings	Erik Johnston	2018-08-09	1	-1/+11
\| * \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-09	1	-0/+1
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...	Erik Johnston	2018-08-09	67	-408/+1156
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Update workers.rst with new paths	Erik Johnston	2018-08-07	1	-0/+1
\| * \| \| \| \| \| \| \| \| \|	Allow ratelimiting on workers	Erik Johnston	2018-08-07	1	-29/+29
\| * \| \| \| \| \| \| \| \| \|	Allow profile changes to happen on workers	Erik Johnston	2018-08-07	5	-8/+106
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3673 from matrix-org/erikj/refactor_state_handler	Erik Johnston	2018-08-22	13	-277/+437
\|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...	Erik Johnston	2018-08-20	208	-3244/+4271
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove redundant room_version checks	Erik Johnston	2018-08-20	2	-15/+4
\| * \| \| \| \| \| \| \| \| \| \| \|	Revert spurious change	Erik Johnston	2018-08-20	1	-2/+2
\| * \| \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-09	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix tests	Erik Johnston	2018-08-09	6	-5/+46
\| * \| \| \| \| \| \| \| \| \| \| \|	Add fast path in state res for zero prev events	Erik Johnston	2018-08-09	1	-1/+6
\| * \| \| \| \| \| \| \| \| \| \| \|	Choose state algorithm based on room version	Erik Johnston	2018-08-09	4	-16/+105
\| * \| \| \| \| \| \| \| \| \| \| \|	Add constants for room versions	Erik Johnston	2018-08-09	1	-2/+7
\| * \| \| \| \| \| \| \| \| \| \| \|	Refactor state module	Erik Johnston	2018-08-09	2	-296/+325
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3735 from matrix-org/travis/federation-spelling	Richard van der Hoff	2018-08-22	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Create 3735.misc	Travis Ralston	2018-08-21	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \|	limt -> limit	Travis Ralston	2018-07-31	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/release-v0.33.3' into develop	Richard van der Hoff	2018-08-22	2	-3/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| / / \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3732 from matrix-org/rav/fix_gdpr_consent	Richard van der Hoff	2018-08-22	2	-3/+13
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-08-21	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	fix another consent encoding fail	Richard van der Hoff	2018-08-21	1	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix 500 error from /consent form	Richard van der Hoff	2018-08-21	1	-2/+11
\| \|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Split the state_group_cache in two (#3726)	Matthew Hodgson	2018-08-22	3	-28/+236
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge tag 'v0.33.3rc2' into develop	Richard van der Hoff	2018-08-21	46	-46/+91
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	changelog v0.33.3rc2	Amber Brown	2018-08-21	3	-2/+10
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3723 from matrix-org/rav/fix_logcontext_disaster	Amber Brown	2018-08-21	3	-3/+18
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-08-20	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix exceptions when a connection is closed before we read the headers	Richard van der Hoff	2018-08-20	2	-2/+10
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Robustness fix for logcontext filter	Richard van der Hoff	2018-08-20	1	-1/+7
\| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	changelog v0.33.3rc1	Amber Brown	2018-08-21	43	-42/+64
\| * \| \| \| \| \| \| \| \| \| \| \|	version	Amber Brown	2018-08-21	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3727 from matrix-org/erikj/dont_error_on_missing_keys	Erik Johnston	2018-08-21	3	-5/+10
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Log more detail when we fail to authenticate request	Erik Johnston	2018-08-21	1	-3/+3
\| * \| \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-21	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \| \|	Don't log exceptions when failing to fetch server keys	Erik Johnston	2018-08-21	2	-4/+8
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3722 from matrix-org/erikj/bg_process_iteration	Erik Johnston	2018-08-21	3	-8/+32
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix typo	Erik Johnston	2018-08-21	1	-4/+4
\| * \| \| \| \| \| \| \| \| \| \|	isort	Erik Johnston	2018-08-21	1	-1/+2
\| * \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-20	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \|	Make the in flight requests metrics thread safe	Erik Johnston	2018-08-20	1	-3/+10
\| * \| \| \| \| \| \| \| \| \| \|	Make the in flight background process metrics thread safe	Erik Johnston	2018-08-20	1	-5/+20
\|/ / / / / / / / / / /
* \| \| / / / / / / / /	Port over enough to get some sytests running on Python 3 (#3668)	Amber Brown	2018-08-20	12	-40/+91
\| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #3719 from matrix-org/erikj/use_cache_fact	Erik Johnston	2018-08-20	2	-2/+3
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-20	1	-0/+1
\| * \| \| \| \| \| \| \| \| \|	Use get_cache_factor_for function for `state_cache`	Erik Johnston	2018-08-20	1	-2/+2
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #3713 from matrix-org/erikj/fixup_fed_logging	Erik Johnston	2018-08-20	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-17	1	-0/+1
\| * \| \| \| \| \| \| \| \| \|	Fix logging bug in EDU handling over replication	Erik Johnston	2018-08-17	1	-1/+1
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3709 from matrix-org/rav/logcontext_for_replication_commands	Richard van der Hoff	2018-08-17	9	-20/+54
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-08-17	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \|	Logcontexts for replication command handlers	Richard van der Hoff	2018-08-17	8	-20/+53
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates	Richard van der Hoff	2018-08-17	6	-21/+29
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-08-17	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \|	Fix logcontexts for running pushers	Richard van der Hoff	2018-08-17	5	-21/+28
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Integrate presence from hotfixes (#3694)	Amber Brown	2018-08-18	17	-67/+303
* \| \| \| \| \| \| \| \| \| \|	Remove v1/register's broken shared secret functionality (#3703)	Amber Brown	2018-08-18	2	-54/+1
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3701 from matrix-org/rav/use_producer_for_responses	Richard van der Hoff	2018-08-17	9	-64/+63
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-08-15	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \|	Fix the tests	Amber Brown	2018-08-15	7	-60/+49
\| * \| \| \| \| \| \| \| \| \| \|	Use a producer to stream back responses	Richard van der Hoff	2018-08-15	1	-4/+13
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3700 from matrix-org/rav/wait_for_producers	Richard van der Hoff	2018-08-17	3	-92/+180
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-08-15	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \| \|	Refactor request logging code	Richard van der Hoff	2018-08-15	2	-92/+179
\| \| \| \| \| \| \| \| \| \| \| * \|	Update notice format	Erik Johnston	2018-08-22	3	-8/+24
\| \| \| \| \| \| \| \| \| \| \| * \|	rename error code	Neil Johnson	2018-08-18	4	-8/+8
\| \| \| \| \| \| \| \| \| \| \| * \|	special case server_notices_mxid	Neil Johnson	2018-08-18	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| * \|	special case server_notices_mxid	Neil Johnson	2018-08-18	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \| * \|	clean up, no functional changes	Neil Johnson	2018-08-17	3	-56/+64
\| \| \| \| \| \| \| \| \| \| \| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...	Neil Johnson	2018-08-17	9	-24/+75
\| \| \| \| \| \| \| \| \| \| \| \|\ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3707 from matrix-org/neilj/limit_exceeded_error	Neil Johnson	2018-08-17	9	-24/+75
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse in...	Neil Johnson	2018-08-17	12	-4/+36
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'develop' into neilj/limit_exceeded_error	Neil Johnson	2018-08-17	11	-4/+35
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	add new error type ResourceLimit	Neil Johnson	2018-08-16	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \|	server limits config docs	Neil Johnson	2018-08-17	1	-0/+26
\| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	add new error type ResourceLimit	Neil Johnson	2018-08-16	8	-24/+47
\| \| \| \| \| \| \| \| \| \| \| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...	Neil Johnson	2018-08-17	11	-4/+34
\| \| \| \| \| \| \| \| \| \| \| \|\ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre...	Neil Johnson	2018-08-17	7	-3/+29
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	remove errant yield	Neil Johnson	2018-08-17	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \|	For resource limit blocked users, prevent writing into rooms	Neil Johnson	2018-08-16	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \|	call reap on start up and fix under reaping bug	Neil Johnson	2018-08-16	4	-2/+19
\| * \| \| \| \| \| \| \| \| \| \| \| \|	block event creation and room creation on hitting resource limits	Neil Johnson	2018-08-16	2	-1/+9
\| \| \|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3712 from matrix-org/travis/register-admin-docs	Amber Brown	2018-08-17	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Create 3712.misc	Travis Ralston	2018-08-17	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \| \|	Update the admin register documentation to return a real user ID	Travis Ralston	2018-08-17	1	-1/+1
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3705 from matrix-org/erikj/fix_inbound_fed_worker	Erik Johnston	2018-08-16	2	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-16	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \|	Fix inbound federation on reader worker	Erik Johnston	2018-08-16	1	-0/+2
\|/ / / / / / / / / / /
\| \| \| \| \| \| \| \| \| * \|	flake8	Neil Johnson	2018-08-16	1	-3/+2
\| \| \| \| \| \| \| \| \| * \|	refactor for readability, and reuse caching for setting tags	Neil Johnson	2018-08-16	3	-68/+115
\| \| \| \| \| \| \| \| \| * \|	add room tagging	Neil Johnson	2018-08-16	1	-9/+5
\| \| \| \| \| \| \| \| \| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...	Neil Johnson	2018-08-16	6	-3/+98
\| \| \| \| \| \| \| \| \| \|\ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Add GET media/v1/config (#3184)	Will Hunt	2018-08-16	3	-1/+51
* \| \| \| \| \| \| \| \| \| \|	lazyload aware /messages (#3589)	Matthew Hodgson	2018-08-16	3	-2/+47
\| \| \| \| \| \| \| \| \| * \|	check for room state before deciding on action	Neil Johnson	2018-08-16	3	-87/+58
\| \| \| \| \| \| \| \| \| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...	Neil Johnson	2018-08-16	7	-28/+169
\| \| \| \| \| \| \| \| \| \|\ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	initial cut at a room summary API (#3574)	Matthew Hodgson	2018-08-16	6	-18/+159
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3686 from matrix-org/rav/changelog_links_to_prs	Richard van der Hoff	2018-08-15	1	-10/+10
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Changelog should link to PRs	Richard van der Hoff	2018-08-13	1	-10/+10
\| \| \| \| \| \| \| \| \| \| * \|	WIP impl commiting to get feedback	Neil Johnson	2018-08-16	1	-6/+74
\| \| \| \| \| \| \| \| \| \| * \|	fix case where empty string state check is evaulated as False	Neil Johnson	2018-08-16	1	-1/+2
\| \| \| \| \| \| \| \| \| \| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...	Neil Johnson	2018-08-15	10	-23/+231
\| \| \| \| \| \| \| \| \| \| \|\ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus	Neil Johnson	2018-08-15	4	-4/+59
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix mau blocking calulation bug on login	Neil Johnson	2018-08-15	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by...	Neil Johnson	2018-08-15	31	-186/+615
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by...	Neil Johnson	2018-08-14	5	-4/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	fix off by 1 errors	Neil Johnson	2018-08-14	2	-3/+14
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	support admin_email config and pass through into blocking errors, return Auth...	Neil Johnson	2018-08-14	2	-5/+4
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	fix off by 1s on mau	Neil Johnson	2018-08-14	3	-7/+50
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/...	Neil Johnson	2018-08-14	1	-10/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/...	Neil Johnson	2018-08-14	8	-22/+46
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei...	Neil Johnson	2018-08-14	7	-20/+111
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove incorrectly re-added changelog files	Richard van der Hoff	2018-08-15	2	-2/+0
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	speed up /members and add at= and membership params (#3568)	Matthew Hodgson	2018-08-15	8	-19/+174
\| \|_\|_\|_\|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| \| \| \| \| \| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...	Neil Johnson	2018-08-15	163	-2853/+2949
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3653 from matrix-org/erikj/split_federation	Erik Johnston	2018-08-15	16	-138/+512
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...	Erik Johnston	2018-08-15	217	-2760/+2605
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use federation handler function rather than duplicate	Erik Johnston	2018-08-15	2	-48/+10
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename slave TransactionStore to SlaveTransactionStore	Erik Johnston	2018-08-15	6	-11/+11
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs/workers.rst	Erik Johnston	2018-08-09	1	-0/+13
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-09	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move clean_room_for_join to master	Erik Johnston	2018-08-09	2	-2/+49
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixup doc comments	Erik Johnston	2018-08-09	2	-0/+28
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...	Erik Johnston	2018-08-09	67	-408/+1156
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pull in necessary stores in federation_reader	Erik Johnston	2018-08-06	2	-1/+2
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move necessary storage functions to worker classes	Erik Johnston	2018-08-06	3	-98/+100
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Import all functions from TransactionStore	Erik Johnston	2018-08-06	1	-11/+2
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add EDU/query handling over replication	Erik Johnston	2018-08-06	4	-13/+62
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add replication APIs for persisting federation events	Erik Johnston	2018-08-06	4	-10/+290
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3687 from matrix-org/neilj/admin_email	Neil Johnson	2018-08-15	9	-30/+38
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove changelog referencing another PR	Neil Johnson	2018-08-15	1	-1/+0
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clean up AuthError	Neil Johnson	2018-08-15	1	-7/+3
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'neilj/update_limits_error_codes' of github.com:matrix-org/synap...	Neil Johnson	2018-08-15	4	-6/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update error codes	Neil Johnson	2018-08-15	1	-2/+2
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update resource limit error codes	Neil Johnson	2018-08-15	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update error codes for resource limiting	Neil Johnson	2018-08-15	2	-4/+3
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update admin email to uri	Neil Johnson	2018-08-15	2	-2/+2
\| \|/ / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	replace admin_email with admin_uri for greater flexibility	Neil Johnson	2018-08-15	5	-11/+11
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email	Neil Johnson	2018-08-14	18	-76/+373
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove blank line	Neil Johnson	2018-08-14	1	-1/+0
\| \| \|_\|_\|_\|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Update register.py	Neil Johnson	2018-08-14	1	-10/+0
\| \| \|_\|_\|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	set admin email via config	Neil Johnson	2018-08-13	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \|	support admin_email config and pass through into blocking errors, return Auth...	Neil Johnson	2018-08-13	7	-22/+45
\| \| \|_\|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name	Neil Johnson	2018-08-15	2	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_pro...	Neil Johnson	2018-08-14	8	-22/+115
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Rename MAU prometheus metric	Neil Johnson	2018-08-14	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \|	pep8	Neil Johnson	2018-08-14	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \|	combine mau metrics into one group	Neil Johnson	2018-08-14	1	-4/+3
\| \| \|_\|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3667 from matrix-org/erikj/fixup_unbind	Erik Johnston	2018-08-15	6	-20/+79
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Log when we 3pid/unbind request fails	Erik Johnston	2018-08-09	1	-0/+2
\| * \| \| \| \| \| \| \| \| \| \| \|	Don't fail requests to unbind 3pids for non supporting ID servers	Erik Johnston	2018-08-08	6	-20/+77
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_re...	Neil Johnson	2018-08-14	4	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	fix setup_test_homeserver to be postgres compatible	Neil Johnson	2018-08-14	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved...	Neil Johnson	2018-08-14	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \|	adding missing yield	Neil Johnson	2018-08-14	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \|	in case max_mau is less than I think	Neil Johnson	2018-08-14	1	-1/+1
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3670 from matrix-org/neilj/mau_sync_block	Neil Johnson	2018-08-14	7	-20/+112
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	make comments clearer	Neil Johnson	2018-08-14	1	-1/+2
\| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Dockerised sytest (#3660)	Amber Brown	2018-08-14	4	-0/+53
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3681 from matrix-org/neilj/fix_reap_users_in_postgres	Amber Brown	2018-08-14	2	-16/+29
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_po...	Amber Brown	2018-08-14	56	-292/+404
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Implement a new test baseclass to cut down on boilerplate (#3684)	Amber Brown	2018-08-14	3	-37/+174
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-base	Jan Christian Grünhage	2018-08-14	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	update docker base-image to alpine 3.8	Jan Christian Grünhage	2018-08-09	2	-1/+2
\| \| \|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \|