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

	Commit message (Expand)	Author	Age	Files	Lines
...
\| \| * \| \| \| \| \| \| \| \| \| \|	Add maybe_awaitable and fix __init__ bugs	Erik Johnston	2019-10-11	2	-2/+34
\| \| * \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-11	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Port synaps/rest/client/users.py to async/await	Erik Johnston	2019-10-11	1	-11/+7
\| \| * \| \| \| \| \| \| \| \| \| \|	Port synaps/rest/client/server_notice_servlet.py to async/await	Erik Johnston	2019-10-11	1	-6/+3
\| \| * \| \| \| \| \| \| \| \| \| \|	Port synaps/rest/client/media.py to async/await	Erik Johnston	2019-10-11	1	-16/+11
\| \| * \| \| \| \| \| \| \| \| \| \|	Port rest/admin/__init__.py to async/await	Erik Johnston	2019-10-11	1	-72/+55
\| * \| \| \| \| \| \| \| \| \| \| \|	Add missing BOOLEAN_COLUMNs to synapse_port_db (#6216)	Bart Noordervliet	2019-10-18	2	-0/+3
* \| \| \| \| \| \| \| \| \| \| \| \|	1.4.1	Andrew Morgan	2020-02-26	3	-1/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	1.4.1	Brendan Abolivier	2019-10-18	3	-1/+13
* \| \| \| \| \| \| \| \| \| \| \| \|	Fix presence timeouts when synchrotron restarts. (#6212)	Andrew Morgan	2020-02-26	5	-5/+51
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix presence timeouts when synchrotron restarts. (#6212)	Erik Johnston	2019-10-18	4	-5/+50
\| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove dead changelog file	Richard van der Hoff	2019-10-17	1	-1/+0
\| * \| \| \| \| \| \| \| \| \| \|	Fix up changelogs	Richard van der Hoff	2019-10-17	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \|	Merge tag 'v1.4.1rc1' into develop	Richard van der Hoff	2019-10-17	2	-1/+9
\| \|\\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	1.4.1rc1	Andrew Morgan	2020-02-26	4	-11/+17
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	1.4.1rc1 v1.4.1rc1	Richard van der Hoff	2019-10-17	3	-2/+9
\| * \| \| \| \| \| \| \| \| \| \|	Do the update as a background index	Erik Johnston	2019-10-17	2	-9/+51
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets	Andrew Morgan	2020-02-26	1	-8/+9
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets	Erik Johnston	2019-10-17	3	-4/+29
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage	Andrew Morgan	2020-02-26	4	-18/+23
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage	Hubert Chathi	2019-10-11	4	-18/+23
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	expand on comment	Hubert Chathi	2019-10-11	1	-1/+2
\| \| * \| \| \| \| \| \| \| \| \| \|	make sure we actually return something	Hubert Chathi	2019-10-10	2	-2/+9
\| \| * \| \| \| \| \| \| \| \| \| \|	add changelog	Hubert Chathi	2019-10-10	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	make storage layer in charge of interpreting the device key data	Hubert Chathi	2019-10-10	3	-19/+15
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version	Andrew Morgan	2020-02-26	4	-19/+35
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version	Hubert Chathi	2019-10-11	4	-19/+35
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	change test name to be unique	Hubert Chathi	2019-10-10	1	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	add changelog	Hubert Chathi	2019-10-09	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	make version optional in body of e2e backup version update	Hubert Chathi	2019-10-09	3	-19/+34
\| \| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6195 from matrix-org/erikj/opentracing_preview_url	Andrew Morgan	2020-02-26	3	-5/+12
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6195 from matrix-org/erikj/opentracing_preview_url	Erik Johnston	2019-10-11	3	-5/+12
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-11	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Trace non-JSON APIs, /media, /key etc	Erik Johnston	2019-10-11	2	-5/+11
* \| \| \| \| \| \| \| \| \| \| \| \|	cas: support setting display name (#6114)	Andrew Morgan	2020-02-26	4	-1/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	cas: support setting display name (#6114)	Valérian Rousset	2019-10-11	4	-1/+8
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Fix MAU reaping where reserved users are specified. (#6168)	Andrew Morgan	2020-02-26	4	-51/+115
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix MAU reaping where reserved users are specified. (#6168)	Neil Johnson	2019-10-11	4	-51/+115
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6156 from matrix-org/erikj/postgres_any	Andrew Morgan	2020-02-26	15	-109/+190
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6156 from matrix-org/erikj/postgres_any	Erik Johnston	2019-10-10	15	-109/+190
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix SQLite take 2	Erik Johnston	2019-10-10	1	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix SQLite	Erik Johnston	2019-10-10	1	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Remove add_in_list_sql_clause	Erik Johnston	2019-10-10	4	-34/+25
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/postgres_any	Erik Johnston	2019-10-10	8	-102/+236
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-10	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Replace IN usage with helper funcs	Erik Johnston	2019-10-10	11	-97/+138
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Add helper funcs to use postgres ANY	Erik Johnston	2019-10-10	1	-8/+56
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6186 from matrix-org/erikj/disable_sql_bytes	Andrew Morgan	2020-02-26	8	-15/+65
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6186 from matrix-org/erikj/disable_sql_bytes	Erik Johnston	2019-10-10	8	-15/+65
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix postgres unit tests	Erik Johnston	2019-10-10	1	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix store_url_cache using bytes	Erik Johnston	2019-10-10	1	-2/+2
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq...	Erik Johnston	2019-10-10	8	-102/+236
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq...	Erik Johnston	2019-10-10	135	-1692/+2474
\| \| \|\\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-09	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Do the update as a background index	Erik Johnston	2019-10-09	2	-9/+51
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Disable bytes usage with postgres	Erik Johnston	2019-10-08	3	-3/+10
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6191 from matrix-org/rav/fix_packaging	Andrew Morgan	2020-02-26	2	-0/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6191 from matrix-org/rav/fix_packaging	Erik Johnston	2019-10-10	2	-3/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix python packaging	Richard van der Hoff	2019-10-10	2	-3/+2
\| \|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6127 from matrix-org/erikj/patch_inner	Andrew Morgan	2020-02-26	6	-99/+234
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6127 from matrix-org/erikj/patch_inner	Erik Johnston	2019-10-10	6	-99/+234
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Fixup comments	Erik Johnston	2019-10-10	1	-3/+3
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix py3.5	Erik Johnston	2019-10-10	1	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix py3.5	Erik Johnston	2019-10-10	1	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	sort	Erik Johnston	2019-10-10	1	-3/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Appease mypy	Erik Johnston	2019-10-10	1	-13/+18
\| \| * \| \| \| \| \| \| \| \| \| \|	Add coments	Erik Johnston	2019-10-10	1	-5/+25
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner	Erik Johnston	2019-10-10	48	-163/+556
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-10	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix packaging	Erik Johnston	2019-10-10	1	-2/+4
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Log correct context	Erik Johnston	2019-10-10	1	-6/+6
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Test for sentinel commit	Erik Johnston	2019-10-10	1	-2/+19
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Move patch_inline_callbacks into synapse/	Erik Johnston	2019-10-10	3	-4/+4
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner	Erik Johnston	2019-10-09	99	-1106/+1795
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Update	Erik Johnston	2019-09-27	1	-8/+15
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Patch inlinecallbacks for log contexts	Erik Johnston	2019-09-27	5	-10/+95
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Add domain validation when creating room with list of invitees (#6121)	Andrew Morgan	2020-02-26	3	-1/+13
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add domain validation when creating room with list of invitees (#6121)	werner291	2019-10-10	3	-1/+13
* \| \| \| \| \| \| \| \| \| \| \| \| \|	before fulfilling a group invite,check if user is already joined/invited (#3436)	Andrew Morgan	2020-02-26	2	-4/+17
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	before fulfilling a group invite,check if user is already joined/invited (#3436)	Michael Telatynski	2019-10-10	2	-4/+17
* \| \| \| \| \| \| \| \| \| \| \| \| \|	send 404 as http-status when filter-id is unknown to the server (#2380)	Andrew Morgan	2020-02-26	4	-23/+33
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	send 404 as http-status when filter-id is unknown to the server (#2380)	krombel	2019-10-10	4	-23/+33
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Add snapcraft packaging information (#6084)	Andrew Morgan	2020-02-26	3	-0/+24
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add snapcraft packaging information (#6084)	James	2019-10-10	3	-0/+24
\| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Fix races in room stats (and other) updates. (#6187)	Andrew Morgan	2020-02-26	7	-25/+63
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix races in room stats (and other) updates. (#6187)	Richard van der Hoff	2019-10-10	7	-25/+63
* \| \| \| \| \| \| \| \| \| \| \| \|	Rewrite the user_filter migration again (#6184)	Andrew Morgan	2020-02-26	2	-26/+33
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Rewrite the user_filter migration again (#6184)	Richard van der Hoff	2019-10-10	2	-26/+33
* \| \| \| \| \| \| \| \| \| \| \| \|	Move tag/push rules room upgrade checking ealier (#6155)	Andrew Morgan	2020-02-26	2	-18/+45
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Move tag/push rules room upgrade checking ealier (#6155)	Andrew Morgan	2019-10-10	2	-18/+45
* \| \| \| \| \| \| \| \| \| \| \| \|	Refactor HomeserverConfig so it can be typechecked (#6137)	Andrew Morgan	2020-02-26	37	-94/+415
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Refactor HomeserverConfig so it can be typechecked (#6137)	Amber Brown	2019-10-10	37	-94/+415
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets	Andrew Morgan	2020-02-26	3	-4/+29
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets	Erik Johnston	2019-10-09	3	-4/+29
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Update changelog.d/6185.bugfix	Erik Johnston	2019-10-09	1	-1/+1
\| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Fix existing hex encoded json values in DB	Erik Johnston	2019-10-08	1	-0/+26
\| \| * \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-08	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \|	Fix inserting bytes as text	Erik Johnston	2019-10-08	1	-4/+2
\| \| \| \|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #6178 from matrix-org/babolivier/factor_out_bg_updates	Andrew Morgan	2020-02-26	10	-605/+671
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #6178 from matrix-org/babolivier/factor_out_bg_updates	Brendan Abolivier	2019-10-09	10	-605/+671
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Fix RegistrationStore	Brendan Abolivier	2019-10-08	1	-1/+1
\| \| * \| \| \| \| \| \| \| \| \|	Cleanup client_ips	Brendan Abolivier	2019-10-08	1	-7/+0
\| \| * \| \| \| \| \| \| \| \| \|	Don't end up with 4 classes in registration	Brendan Abolivier	2019-10-08	1	-52/+50
\| \| * \| \| \| \| \| \| \| \| \|	Changelog	Brendan Abolivier	2019-10-07	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-10-07	3	-3/+3
\| \| * \| \| \| \| \| \| \| \| \|	Move roommember's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-108/+114
\| \| * \| \| \| \| \| \| \| \| \|	Move user_directory's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-84/+94
\| \| * \| \| \| \| \| \| \| \| \|	Move state's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-190/+204
\| \| * \| \| \| \| \| \| \| \| \|	Move search's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-25/+31
\| \| * \| \| \| \| \| \| \| \| \|	Move registration's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-95/+103
\| \| * \| \| \| \| \| \| \| \| \|	Move media_repository's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-3/+9
\| \| * \| \| \| \| \| \| \| \| \|	Move devices's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-22/+27
\| \| * \| \| \| \| \| \| \| \| \|	Move deviceinbox's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-15/+22
\| \| * \| \| \| \| \| \| \| \| \|	Move client_ips's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-94/+106
* \| \| \| \| \| \| \| \| \| \| \|	add M_TOO_LARGE error code for uploading a too large file (#6151)	Andrew Morgan	2020-02-26	2	-2/+7
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	add M_TOO_LARGE error code for uploading a too large file (#6151)	Anshul Angaria	2019-10-08	2	-2/+7
* \| \| \| \| \| \| \| \| \| \| \|	Remove unused public room list timeout param (#6179)	Andrew Morgan	2020-02-26	2	-12/+2
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove unused public room list timeout param (#6179)	Andrew Morgan	2019-10-08	2	-12/+2
* \| \| \| \| \| \| \| \| \| \| \|	Fix /federation/v1/state for recent room versions (#6170)	Andrew Morgan	2020-02-26	3	-14/+2
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix /federation/v1/state for recent room versions (#6170)	Richard van der Hoff	2019-10-08	2	-13/+1
\| * \| \| \| \| \| \| \| \| \| \|	fix changelog	Richard van der Hoff	2019-10-07	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failure	Andrew Morgan	2020-02-26	2	-6/+5
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failure	Erik Johnston	2019-10-07	2	-6/+5
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Fixup newsfile	Erik Johnston	2019-10-03	2	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Remove unused variable	Erik Johnston	2019-10-03	1	-2/+0
\| \| * \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-03	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Don't regenerate numeric user ID if registration fails.	Erik Johnston	2019-10-03	1	-4/+4
* \| \| \| \| \| \| \| \| \| \| \| \|	Log responder we are using. (#6139)	Andrew Morgan	2020-02-26	4	-2/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Log responder we are using. (#6139)	Michael Kaye	2019-10-07	2	-1/+2
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix changelog for PR #6175	Brendan Abolivier	2019-10-07	2	-1/+1
* \| \| \| \| \| \| \| \| \| \| \|	add some logging to the rooms stats updates, to try to track down a flaky tes...	Andrew Morgan	2020-02-26	3	-0/+5
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	add some logging to the rooms stats updates, to try to track down a flaky tes...	Richard van der Hoff	2019-10-07	3	-0/+5
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_index	Andrew Morgan	2020-02-26	2	-2/+3
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_index	Brendan Abolivier	2019-10-07	2	-2/+3
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Changelog	Brendan Abolivier	2019-10-07	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix unique_user_filter_index schema update	Brendan Abolivier	2019-10-07	1	-2/+2
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6159 from matrix-org/erikj/cache_memberships	Andrew Morgan	2020-02-26	2	-19/+46
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6159 from matrix-org/erikj/cache_memberships	Erik Johnston	2019-10-07	2	-19/+46
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix bug where we didn't pull out event ID	Erik Johnston	2019-10-07	1	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cache_memb...	Erik Johnston	2019-10-03	5	-19/+44
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Use the right error....	Erik Johnston	2019-10-03	1	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	pep8	Erik Johnston	2019-10-03	1	-1/+0
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fixup names and comments	Erik Johnston	2019-10-03	1	-6/+7
\| \| * \| \| \| \| \| \| \| \| \| \| \|	cachedList descriptor doesn't like typing	Erik Johnston	2019-10-03	1	-2/+2
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-03	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Cache room membership lookups in _get_joined_users_from_context	Erik Johnston	2019-10-03	1	-19/+45
\| \| \| \|/ / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revoked	Andrew Morgan	2020-02-26	1	-4/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revoked	Brendan Abolivier	2019-10-04	3	-2/+89
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Lint (again)	Brendan Abolivier	2019-10-03	1	-3/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-10-03	1	-5/+5
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Add test case	Brendan Abolivier	2019-10-03	2	-1/+84
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Changelog	Brendan Abolivier	2019-10-02	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-10-02	1	-1/+3
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Don't 500 code when trying to exchange a revoked 3PID invite	Brendan Abolivier	2019-10-02	1	-2/+13
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Update `user_filters` table to have a unique index, and non-null columns (#1172)	Andrew Morgan	2020-02-26	2	-0/+47
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Update `user_filters` table to have a unique index, and non-null columns (#1172)	Alexander Maznev	2019-10-04	2	-0/+47
* \| \| \| \| \| \| \| \| \| \| \| \| \|	media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)	Andrew Morgan	2020-02-26	2	-3/+12
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)	Robert Swain	2019-10-04	2	-3/+12
\| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	add some metrics on the federation sender (#6160)	Andrew Morgan	2020-02-26	5	-19/+44
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	add some metrics on the federation sender (#6160)	Richard van der Hoff	2019-10-03	5	-19/+44
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into develop	Andrew Morgan	2020-02-26	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into develop	Andrew Morgan	2019-10-03	9	-8/+38
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge tag 'v1.4.0'	Andrew Morgan	2019-10-03	303	-5895/+13375
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	1.4.0	Andrew Morgan	2020-02-26	4	-2/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	1.4.0 v1.4.0 github/release-v1.4.0 release-v1.4.0	Andrew Morgan	2019-10-03	4	-2/+16
* \| \| \| \| \| \| \| \| \| \| \|	Replace client_secret with <redacted> in server logs (#6158)	Andrew Morgan	2020-02-26	2	-2/+5
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Replace client_secret with <redacted> in server logs (#6158)	Andrew Morgan	2019-10-03	2	-2/+5
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6154 from matrix-org/erikj/fix_appservice_pagination	Andrew Morgan	2020-02-26	2	-18/+19
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6154 from matrix-org/erikj/fix_appservice_pagination	Erik Johnston	2019-10-02	2	-18/+19
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-02	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix appservice room list pagination	Erik Johnston	2019-10-02	1	-18/+18
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatable	Andrew Morgan	2020-02-26	2	-0/+4
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatable	Erik Johnston	2019-10-02	2	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_room_l...	Erik Johnston	2019-10-02	0	-0/+0
\| \| \|\\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-02	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix not showing non-federatable rooms to remote room list queries	Erik Johnston	2019-10-02	1	-0/+3
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6148 from matrix-org/erikj/find_next_generated	Andrew Morgan	2020-02-26	2	-1/+4
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6148 from matrix-org/erikj/find_next_generated	Erik Johnston	2019-10-02	2	-1/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-02	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Bound find_next_generated_user_id DB query.	Erik Johnston	2019-10-02	1	-1/+3
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6152 from matrix-org/erikj/fix_room_list	Andrew Morgan	2020-02-26	3	-27/+60
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6152 from matrix-org/erikj/fix_room_list	Erik Johnston	2019-10-02	3	-27/+60
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-02	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix public room list pagination.	Erik Johnston	2019-10-02	2	-27/+59
\| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into develop	Brendan Abolivier	2019-10-02	4	-9/+45
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Land improved room list based on room stats (#6019)	Andrew Morgan	2020-02-26	7	-350/+273
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Land improved room list based on room stats (#6019)	Erik Johnston	2019-10-02	7	-350/+273
* \| \| \| \| \| \| \| \| \| \| \| \|	1.4.0rc2	Andrew Morgan	2020-02-26	7	-6/+19
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	1.4.0rc2 v1.4.0rc2	Andrew Morgan	2019-10-02	7	-6/+19
* \| \| \| \| \| \| \| \| \| \| \| \|	Fix up some typechecking (#6150)	Andrew Morgan	2020-02-26	22	-40/+104
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix up some typechecking (#6150)	Amber Brown	2019-10-02	22	-40/+104
* \| \| \| \| \| \| \| \| \| \| \| \|	Fix yields and copy instead of move push rules on room upgrade (#6144)	Andrew Morgan	2020-02-26	3	-12/+9
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix yields and copy instead of move push rules on room upgrade (#6144)	Andrew Morgan	2019-10-02	3	-12/+9
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2019-10-02	11	-19/+193
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/s...	Erik Johnston	2019-10-01	8	-11/+60
\| \|\ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \	Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings	Andrew Morgan	2020-02-26	4	-1/+31
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings	Erik Johnston	2019-10-02	4	-1/+31
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-02	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix errors storing large retry intervals.	Erik Johnston	2019-10-02	3	-1/+30
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6145 from matrix-org/erikj/fix_censored_redactions	Andrew Morgan	2020-02-26	3	-0/+51
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6145 from matrix-org/erikj/fix_censored_redactions	Erik Johnston	2019-10-02	3	-0/+51
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-02	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix fetching censored redactions from DB	Erik Johnston	2019-10-02	2	-0/+50
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6141 from matrix-org/erikj/censor_redactions_fix	Andrew Morgan	2020-02-26	4	-18/+111
\|\\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6141 from matrix-org/erikj/censor_redactions_fix	Erik Johnston	2019-10-02	4	-18/+111
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-01	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Use `received_ts` to find uncensored redacted events	Erik Johnston	2019-10-01	1	-14/+7
\| \| * \| \| \| \| \| \| \| \| \| \|	Add received_ts column to redactions.	Erik Johnston	2019-10-01	3	-9/+92
\| \| * \| \| \| \| \| \| \| \| \| \|	Don't repeatedly attempt to censor events we don't have.	Erik Johnston	2019-10-01	1	-1/+17
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6135 from matrix-org/erikj/fixup_devices_last_seen_query	Andrew Morgan	2020-02-26	4	-7/+55
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6135 from matrix-org/erikj/fixup_devices_last_seen_query	Erik Johnston	2019-10-01	4	-7/+55
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-09-30	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \|	Fix `devices_last_seen` background update.	Erik Johnston	2019-09-30	3	-7/+54
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Drop unused tables (#6115)	Andrew Morgan	2020-02-26	2	-0/+21
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Drop unused tables (#6115)	Richard van der Hoff	2019-09-30	2	-0/+21
* \| \| \| \| \| \| \| \| \| \|	Edit SimpleHttpClient to reference that header keys can be passed as str or b...	Andrew Morgan	2020-02-26	2	-6/+7
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Edit SimpleHttpClient to reference that header keys can be passed as str or b...	Andrew Morgan	2019-09-27	2	-6/+7
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #6125 from matrix-org/babolivier/deactivation-invite	Andrew Morgan	2020-02-26	1	-17/+3
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #6125 from matrix-org/babolivier/deactivation-invite	Brendan Abolivier	2019-09-27	3	-14/+92
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Incorporate review	Brendan Abolivier	2019-09-27	1	-4/+2
\| \| * \| \| \| \| \| \| \| \|	Update synapse/handlers/deactivate_account.py	Brendan Abolivier	2019-09-27	1	-1/+3
\| \| * \| \| \| \| \| \| \| \|	Update synapse/handlers/deactivate_account.py	Brendan Abolivier	2019-09-27	1	-1/+1
\| \| * \| \| \| \| \| \| \| \|	Update changelog.d/6125.feature	Brendan Abolivier	2019-09-27	1	-1/+1
\| \| * \| \| \| \| \| \| \| \|	ok	Brendan Abolivier	2019-09-27	1	-1/+3
\| \| * \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-09-27	2	-10/+2
\| \| * \| \| \| \| \| \| \| \|	Changelog	Brendan Abolivier	2019-09-27	1	-0/+1
\| \| * \| \| \| \| \| \| \| \|	Add test to validate the change	Brendan Abolivier	2019-09-27	1	-13/+57
\| \| * \| \| \| \| \| \| \| \|	Fixup and add some logging	Brendan Abolivier	2019-09-27	1	-1/+9
\| \| * \| \| \| \| \| \| \| \|	Reject pending invites on deactivation	Brendan Abolivier	2019-09-27	1	-0/+31
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)	Andrew Morgan	2020-02-26	6	-388/+366
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)	Andrew Morgan	2019-09-27	3	-364/+360
* \| \| \| \| \| \| \| \| \|	Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-span	Andrew Morgan	2020-02-25	3	-1/+22
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-span	Erik Johnston	2019-09-27	3	-1/+22
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	isort	Erik Johnston	2019-09-25	1	-1/+1
\| \| * \| \| \| \| \| \| \| \|	Add device and appservice tags	Erik Johnston	2019-09-25	1	-0/+3
\| \| * \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-09-25	1	-0/+1
\| \| * \| \| \| \| \| \| \| \|	Add tags for event_id and txn_id in event sending	Erik Johnston	2019-09-25	1	-0/+18
\| \| * \| \| \| \| \| \| \| \|	Don't create new span for get_user_by_req	Erik Johnston	2019-09-25	1	-1/+0
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #6117 from matrix-org/erikj/fix_sample_config	Andrew Morgan	2020-02-25	4	-4/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #6117 from matrix-org/erikj/fix_sample_config	Erik Johnston	2019-09-26	3	-2/+3
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-09-26	1	-0/+1
\| \| * \| \| \| \| \| \| \| \| \|	Fix 'redaction_retention_period' sampel config to match guidelines	Erik Johnston	2019-09-26	2	-2/+2
\| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	s/month/week/ to match config	Neil Johnson	2019-09-26	1	-1/+1
\| * \| \| \| \| \| \| \| \| \|	Update CHANGES.md	Richard van der Hoff	2019-09-26	1	-1/+1
* \| \| \| \| \| \| \| \| \| \|	Kill off half-implemented password-reset via sms (#6101)	Andrew Morgan	2020-02-25	134	-198/+157
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Kill off half-implemented password-reset via sms (#6101)	Richard van der Hoff	2019-09-26	2	-64/+2
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	more changelog updates v1.4.0rc1	Richard van der Hoff	2019-09-26	1	-7/+7