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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-11-05	5	-83/+146
\|\ \| \| \| \| \| \|	erikj/split_purge_history
\| *	Remove the psutil dependency (#6318)	Amber Brown	2019-11-05	5	-83/+146
\| \| \| \| \| \|	* remove psutil and replace with resource
* \|	Change to not require a state_groups.room_id index.	Erik Johnston	2019-11-04	4	-53/+45
\| \| \| \| \| \| \| \| \| \|	This does mean that we won't clean up orphaned state groups (i.e. state groups that were persisted but the associated event wasn't).
* \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-11-04	96	-369/+2050
\|\\| \| \| \| \| \| \|	erikj/split_purge_history
\| *	document the REPLICATE command a bit better (#6305)	Richard van der Hoff	2019-11-04	5	-10/+110
\| \| \| \| \| \| \| \|	since I found myself wonder how it works
\| *	Merge pull request #6301 from matrix-org/babolivier/msc2326	Brendan Abolivier	2019-11-01	11	-9/+396
\| \|\ \| \| \| \| \| \|	Implement MSC2326 (label based filtering)
\| \| *	Incorporate review	Brendan Abolivier	2019-11-01	7	-15/+21
\| \| \|
\| \| *	Update synapse/storage/data_stores/main/schema/delta/56/event_labels.sql	Brendan Abolivier	2019-11-01	1	-1/+1
\| \| \| \| \| \| \| \| \|	Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
\| \| *	Add more data to the event_labels table and fix the indexes	Brendan Abolivier	2019-11-01	3	-5/+21
\| \| \|
\| \| *	Add unstable feature flag	Brendan Abolivier	2019-11-01	1	-0/+3
\| \| \|
\| \| *	Lint	Brendan Abolivier	2019-11-01	2	-1/+2
\| \| \|
\| \| *	Incorporate review	Brendan Abolivier	2019-11-01	7	-21/+34
\| \| \|
\| \| *	Lint	Brendan Abolivier	2019-10-30	4	-50/+35
\| \| \|
\| \| *	Changelog	Brendan Abolivier	2019-10-30	1	-0/+1
\| \| \|
\| \| *	Add integration tests for /messages	Brendan Abolivier	2019-10-30	1	-1/+101
\| \| \|
\| \| *	Add more integration testing	Brendan Abolivier	2019-10-30	2	-7/+40
\| \| \|
\| \| *	Add integration tests for sync	Brendan Abolivier	2019-10-30	2	-5/+122
\| \| \|
\| \| *	Add unit tests	Brendan Abolivier	2019-10-30	2	-1/+52
\| \| \|
\| \| *	Add index on label	Brendan Abolivier	2019-10-30	1	-1/+3
\| \| \|
\| \| *	Implement filtering	Brendan Abolivier	2019-10-30	2	-2/+20
\| \| \|
\| \| *	Store labels for new events	Brendan Abolivier	2019-10-30	2	-1/+22
\| \| \|
\| \| *	Add database table for keeping track of labels on events	Brendan Abolivier	2019-10-29	1	-0/+20
\| \| \|
\| * \|	Factor out an _AsyncEventContextImpl (#6298)	Richard van der Hoff	2019-11-01	4	-85/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The intention here is to make it clearer which fields we can expect to be populated when: notably, that the _event_type etc aren't used for the synchronous impl of EventContext.
\| * \|	Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schema	Hubert Chathi	2019-11-01	2	-0/+43
\| \|\ \ \| \| \| \| \| \| \| \|	fix hidden field in devices table for older sqlite
\| \| * \|	add changelog	Hubert Chathi	2019-10-31	1	-0/+1
\| \| \| \|
\| \| * \|	fix hidden field in devices table for older sqlite	Hubert Chathi	2019-10-31	1	-0/+42
\| \| \| \|
\| * \| \|	Add contributer docs for using the provided linters script (#6164)	Jason Robinson	2019-11-02	3	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add lint dependencies black, flake8 and isort These are required when running the `lint.sh` dev scripts. Signed-off-by: Jason Robinson <jasonr@matrix.org> * Add contributer docs for using the providers linters script Add also to the pull request template to avoid build failures due to people not knowing that linters need running. Signed-off-by: Jason Robinson <jasonr@matrix.org> * Fix mention of linter errors correction Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> * Add mention for installing linter dependencies Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> * Remove linters from python dependencies as per PR review Signed-off-by: Jason Robinson <jasonr@matrix.org>
\| * \| \|	Support for routing outbound HTTP requests via a proxy (#6239)	Richard van der Hoff	2019-11-01	16	-12/+812
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \|	Remove last usages of deprecated logging.warn method (#6314)	Andrew Morgan	2019-11-01	3	-3/+4
\| \| \| \|
\| * \| \|	Document lint.sh & allow application to specified files only (#6312)	Neil Pilgrim	2019-11-01	3	-3/+20
\| \| \| \|
\| * \| \|	Depublish a room from the public rooms list when it is upgraded (#6232)	Andrew Morgan	2019-11-01	5	-30/+92
\| \| \| \|
\| * \| \|	Merge pull request #5727 from matrix-org/uhoreg/e2e_cross-signing2-part3	Hubert Chathi	2019-10-31	7	-47/+241
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Cross-signing [4/4] -- federation edition
\| \| * \|	Update synapse/storage/data_stores/main/devices.py	Hubert Chathi	2019-10-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
\| \| * \|	Merge branch 'develop' into cross-signing_federation	Hubert Chathi	2019-10-31	129	-452/+1036
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notify	Hubert Chathi	2019-10-31	6	-3/+59
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	make notification of signatures work with workers
\| \| * \ \	Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify	Hubert Chathi	2019-10-31	122	-448/+973
\| \| \|\ \ \
\| \| * \| \| \|	clean up code a bit	Hubert Chathi	2019-10-31	1	-5/+9
\| \| \| \| \| \|
\| \| * \| \| \|	make user signatures a separate stream	Hubert Chathi	2019-10-30	5	-14/+50
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify	Hubert Chathi	2019-10-30	95	-1233/+1682
\| \| \|\ \ \ \
\| \| * \| \| \| \|	add changelog	Hubert Chathi	2019-10-24	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	make notification of signatures work with workers	Hubert Chathi	2019-10-24	3	-2/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	rstrip slashes from url on appservice (#6306)	Will Hunt	2019-10-31	2	-1/+4
\| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Update black to 19.10b0 (#6304)	Amber Brown	2019-11-01	41	-166/+191
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* update version of black and also fix the mypy config being overridden
\| \| \| \| * \|	rename get_devices_by_remote to get_device_updates_by_remote	Hubert Chathi	2019-10-30	4	-14/+14
\| \| \| \| \| \|
\| \| \| \| * \|	Merge branch 'develop' into cross-signing_federation	Hubert Chathi	2019-10-30	94	-1166/+1615
\| \| \| \| \|\ \ \| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| \| \| * \|	black	Hubert Chathi	2019-10-30	1	-1/+3
\| \| \| \| \| \|
\| \| \| \| * \|	apply changes as a result of PR review	Hubert Chathi	2019-10-30	2	-55/+46
\| \| \| \| \| \|
\| \| \| \| * \|	Merge branch 'develop' into cross-signing_federation	Hubert Chathi	2019-10-24	350	-4588/+5086
\| \| \| \| \|\ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| \| \| * \|	don't error if federation query doesn't have cross-signing keys	Hubert Chathi	2019-10-24	1	-7/+9
\| \| \| \| \| \|
\| \| \| \| * \|	move get_e2e_cross_signing_key to EndToEndKeyWorkerStore so it works with ↵	Hubert Chathi	2019-10-23	1	-67/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	workers
\| \| \| \| * \|	black	Hubert Chathi	2019-10-22	1	-1/+2
\| \| \| \| \| \|
\| \| \| \| * \|	vendor-prefix the EDU name until MSC1756 is merged into the spec	Hubert Chathi	2019-10-22	2	-2/+4
\| \| \| \| \| \|
\| \| \| \| * \|	fix unit test	Hubert Chathi	2019-10-22	1	-1/+3
\| \| \| \| \| \|
\| \| \| \| * \|	add news file	Hubert Chathi	2019-10-22	1	-0/+1
\| \| \| \| \| \|
\| \| \| \| * \|	update to work with newer code, and fix formatting	Hubert Chathi	2019-10-22	3	-6/+7
\| \| \| \| \| \|
\| \| \| \| * \|	add missing param	Hubert Chathi	2019-10-22	1	-1/+1
\| \| \| \| \| \|
\| \| \| \| * \|	make black happy	Hubert Chathi	2019-10-22	2	-27/+39
\| \| \| \| \| \|
\| \| \| \| * \|	don't crash if the user doesn't have cross-signing keys	Hubert Chathi	2019-10-22	1	-14/+25
\| \| \| \| \| \|
\| \| \| \| * \|	implement federation parts of cross-signing	Hubert Chathi	2019-10-22	4	-10/+179
\| \| \| \| \| \|
* \| \| \| \| \|	Fix up comment	Erik Johnston	2019-11-01	1	-2/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Update log line to lie a little less	Erik Johnston	2019-10-31	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Add state_groups.room_id index	Erik Johnston	2019-10-31	2	-0/+24
\| \| \| \| \| \|
* \| \| \| \| \|	Docstrings	Erik Johnston	2019-10-31	1	-3/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Fix purge room API	Erik Johnston	2019-10-31	1	-5/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-31	94	-282/+781
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/split_purge_history
\| * \| \| \| \|	Merge pull request #6294 from matrix-org/erikj/add_state_storage	Erik Johnston	2019-10-31	23	-116/+453
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add StateGroupStorage interface
\| \| * \| \| \| \|	Apply suggestions from code review	Erik Johnston	2019-10-31	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix docstring Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
\| \| * \| \| \| \|	Newsfile	Erik Johnston	2019-10-30	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Port to use state storage	Erik Johnston	2019-10-30	19	-115/+216
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add StateGroupStorage interface	Erik Johnston	2019-10-30	3	-1/+235
\| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	Expose some homeserver functionality to spam checkers (#6259)	Travis Ralston	2019-10-31	3	-1/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Offer the homeserver instance to the spam checker * Newsfile * Linting * Expose a Spam Checker API instead of passing the homeserver object * Alter changelog * s/hs/api
\| * \| \| \| \|	Merge pull request #6307 from matrix-org/erikj/fix_purge_room	Erik Johnston	2019-10-31	4	-2/+84
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix /purge_room admin API
\| \| * \| \| \| \|	Newsfile	Erik Johnston	2019-10-31	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add unit test for /purge_room API	Erik Johnston	2019-10-31	2	-1/+83
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix /purge_room API.	Erik Johnston	2019-10-31	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It fails trying to clean the `topic` table which was recently removed.
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into develop	Richard van der Hoff	2019-10-31	3	-9/+13
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	Update email section of INSTALL.md about account_threepid_delegates (#6272)	Andrew Morgan	2019-10-30	2	-7/+10
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Clarify environment variable usage when running in Docker (#6181)	Anton Lazarev	2019-10-30	1	-2/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove usage of deprecated logger.warn method from codebase (#6271)	Andrew Morgan	2019-10-31	65	-149/+164
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated.
\| * \| \| \| \| \|	fix delete_existing for _persist_events (#6300)	Richard van der Hoff	2019-10-30	3	-5/+3
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|	this is part of _retry_on_integrity_error, so should only be on _persist_events_and_state_updates
* \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-30	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Split purge API into events vs state	Erik Johnston	2019-10-30	6	-184/+308
\|/ / / / /
* \| \| \| \|	Merge pull request #6240 from matrix-org/erikj/split_out_persistence_store	Erik Johnston	2019-10-30	18	-667/+818
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Move persist_events out from main data store.
\| * \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-30	146	-722/+1245
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	erikj/split_out_persistence_store
* \| \| \| \| \|	Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptor	Erik Johnston	2019-10-30	4	-7/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make ObservableDeferred.observe() always return deferred.
\| * \| \| \| \| \|	Clarify docstring	Erik Johnston	2019-10-30	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-30	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make ObservableDeferred.observe() always return deferred.	Erik Johnston	2019-10-30	3	-8/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it easier to use in an async/await world. Also fixes a bug where cache descriptors would occaisonally return a raw value rather than a deferred.
* \| \| \| \| \| \|	Modify doc to update Google ReCaptcha terms (#6257)	Yash Jipkate	2019-10-30	2	-3/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix log line that was printing undefined value (#6278)	Andrew Morgan	2019-10-30	2	-1/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Update CI to run isort on scripts and scripts-dev (#6270)	Andrew Morgan	2019-10-30	3	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix small typo in comment (#6269)	Andrew Morgan	2019-10-30	2	-1/+2
\|/ / / / / /
* \| \| \| \| \|	Fix typo in domain name in account_threepid_delegates config option (#6273)	Andrew Morgan	2019-10-30	3	-2/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Remove redundant arguments to CI's flake8 (#6277)	Andrew Morgan	2019-10-30	2	-1/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Handle FileNotFound error in checking git repository version (#6284)	Andrew Morgan	2019-10-30	2	-4/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #6280 from matrix-org/erikj/receipts_async_await	Erik Johnston	2019-10-30	7	-53/+33
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port receipt and read markers to async/wait
\| * \ \ \ \ \	Merge branch 'erikj/federation_server_async_await' of ↵	Erik Johnston	2019-10-29	13	-62/+96
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:matrix-org/synapse into erikj/receipts_async_await
\| * \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-29	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Port receipt and read markers to async/wait	Erik Johnston	2019-10-29	6	-53/+32
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #6274 from matrix-org/erikj/replication_async	Erik Johnston	2019-10-30	7	-44/+27
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port replication http server endpoints to async/await
\| * \ \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-29	12	-61/+95
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/replication_async
\| * \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-29	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Port replication http server endpoints to async/await	Erik Johnston	2019-10-29	6	-44/+26
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #6275 from matrix-org/erikj/port_rest_events	Erik Johnston	2019-10-30	2	-94/+73
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port room rest handlers to async/await
\| * \ \ \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-29	12	-61/+95
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/port_rest_events
\| * \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Port room rest handlers to async/await	Erik Johnston	2019-10-29	1	-94/+72
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #6279 from matrix-org/erikj/federation_server_async_await	Erik Johnston	2019-10-30	4	-128/+100
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	Port federation_server to async/await
\| * \| \| \| \| \| \| \|	Don't return coroutines	Erik Johnston	2019-10-29	1	-6/+6
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-29	13	-62/+96
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| / / / / / \| \| \|/ / / / / \| \|/\| \| \| \| \|	erikj/federation_server_async_await
* \| \| \| \| \| \|	Fix CI for synapse_port_db (#6276)	Brendan Abolivier	2019-10-29	5	-4/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Don't use a virtualenv * Generate the server's signing key to allow it to start * Add signing key paths to CI configuration files * Use a Python script to create the postgresql database * Improve logging
* \| \| \| \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2019-10-29	7	-57/+43
\|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	1.5.0 v1.5.0 github/release-v1.5.0 release-v1.5.0	Richard van der Hoff	2019-10-29	4	-9/+25
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	update ugrade notes	Richard van der Hoff	2019-10-29	1	-1/+11
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into release-v1.5.0	Richard van der Hoff	2019-10-29	3	-47/+7
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Update UPGRADE.rst	Richard van der Hoff	2019-10-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	another typo
\| \| * \| \| \| \| \|	Update UPGRADE.rst	Richard van der Hoff	2019-10-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix typo
\| \| * \| \| \| \| \|	Clean up the AUTHORS file (#6215)	Richard van der Hoff	2019-10-18	2	-46/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'babolivier/changelog-name' into develop	Brendan Abolivier	2019-10-29	1	-0/+0
\|\\| \| \| \| \| \| \| \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Fix changelog name	Brendan Abolivier	2019-10-29	1	-0/+0
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Make concurrently_execute work with async/await	Erik Johnston	2019-10-29	1	-4/+3
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Newsfile	Erik Johnston	2019-10-29	1	-0/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Port federation_server to async/await	Erik Johnston	2019-10-29	2	-118/+90
\| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #6263 from matrix-org/erikj/caches_return_deferreds	Erik Johnston	2019-10-29	5	-9/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quick fix to ensure cache descriptors always return deferreds
\| * \| \| \| \| \|	Update docstring	Erik Johnston	2019-10-29	1	-3/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-28	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Quick fix to ensure cache descriptors always return deferreds	Erik Johnston	2019-10-28	4	-6/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2019-10-29	3	-5/+10
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #6268 from matrix-org/erikj/case_insensitive_room_dir	Erik Johnston	2019-10-29	3	-5/+10
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make room directory search case insensitive
\| \| * \| \| \| \| \|	Add comment as to why we're pinning black in tests	Erik Johnston	2019-10-29	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Pin black version	Erik Johnston	2019-10-29	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Newsfile	Erik Johnston	2019-10-29	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Make room directory search case insensitive	Erik Johnston	2019-10-29	1	-4/+8
\| \|/ / / / / /
* \| \| \| \| \| \|	Add CI for synapse_port_db (#6140)	Brendan Abolivier	2019-10-28	7	-3/+196
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds: * a test sqlite database * a configuration file for the sqlite database * a configuration file for a postgresql database (using the credentials in `.buildkite/docker-compose.pyXX.pgXX.yaml`) as well as a new script named `.buildkite/scripts/test_synapse_port_db.sh` that: 1. installs Synapse 2. updates the test sqlite database to the latest schema and runs background updates on it 3. creates an empty postgresql database 4. run the `synapse_port_db` script to migrate the test sqlite database to the empty postgresql database (with coverage) Step `2` is done via a new script located at `scripts-dev/update_database`. The test sqlite database is extracted from a SyTest run, so that it can be considered as an actual homeserver's database with actual data in it.
* \| \| \| \| \| \|	Fix broken URL in docker/README.md (#6264)	Tobia De Koninck	2019-10-28	1	-1/+1
\| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
* \| \| \| \| \|	Merge tag 'v1.5.0rc2' into develop	Richard van der Hoff	2019-10-28	9	-12/+46
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Synapse 1.5.0rc2 (2019-10-28) ============================= Bugfixes -------- - Update list of boolean columns in `synapse_port_db`. ([\#6247](https://github.com/matrix-org/synapse/issues/6247)) - Fix /keys/query API on workers. ([\#6256](https://github.com/matrix-org/synapse/issues/6256)) - Improve signature checking on some federation APIs. ([\#6262](https://github.com/matrix-org/synapse/issues/6262)) Internal Changes ---------------- - Move schema delta files to the correct data store. ([\#6248](https://github.com/matrix-org/synapse/issues/6248)) - Small performance improvement by removing repeated config lookups in room stats calculation. ([\#6255](https://github.com/matrix-org/synapse/issues/6255))
\| * \| \| \| \|	1.5.0rc2 v1.5.0rc2	Richard van der Hoff	2019-10-28	7	-6/+19
\| \| \| \| \| \|
\| * \| \| \| \|	Improve signature checking on some federation APIs (#6262)	Richard van der Hoff	2019-10-28	4	-7/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure that we check that events sent over /send_join, /send_leave, and /invite, are correctly signed and come from the expected servers.
* \| \| \| \| \|	Convert EventContext to attrs (#6218)	Richard van der Hoff	2019-10-28	3	-62/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* make EventContext use an attr
* \| \| \| \| \|	Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keys	Hubert Chathi	2019-10-25	4	-0/+109
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	delete keys when deleting backup versions
\| * \| \| \| \| \|	remove unneeded imports	Hubert Chathi	2019-10-25	1	-3/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	switch to using HomeserverTestCase	Hubert Chathi	2019-10-25	1	-19/+25
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	remove some unnecessary lines	Hubert Chathi	2019-10-24	1	-5/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add changelog	Hubert Chathi	2019-10-24	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	delete keys when deleting backups	Hubert Chathi	2019-10-24	3	-0/+109
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2019-10-25	3	-1/+6
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #6255 from matrix-org/erikj/stats_config	Erik Johnston	2019-10-25	3	-1/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove repeated calls to config.stats_enabled.
\| \| * \| \| \| \|	Fix tests	Erik Johnston	2019-10-25	1	-0/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Newsfile	Erik Johnston	2019-10-25	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Remove repeated calls to config.stats_enabled.	Erik Johnston	2019-10-25	1	-1/+3
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turns out that fetching variables from the config object is expensive, so doing it once at startup avoids unnecessary work.
* \| \| \| \| \|	Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2019-10-25	2	-67/+68
\|\\| \| \| \| \|
\| * \| \| \| \|	Merge pull request #6256 from matrix-org/erikj/fix_e2e_workers	Erik Johnston	2019-10-25	2	-67/+68
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|	Fix /keys/query API on workers.
\| \| * \| \| \|	Newsfile	Erik Johnston	2019-10-25	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Fix /keys/query API on workers.	Erik Johnston	2019-10-25	1	-67/+67
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The necessary getters were added only to the master store and not the worker stores.
* \| \| \| \|	Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_logging	Erik Johnston	2019-10-25	7	-17/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Reduce debug logging overhead
\| * \| \| \| \|	Address codestyle concerns	Michael Kaye	2019-10-24	3	-5/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Reduce impact of debug logging	Michael Kaye	2019-10-24	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Delay printf until logging is required.	Michael Kaye	2019-10-24	2	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using % will cause the string to be generated even if debugging is off.
\| * \| \| \| \|	use %r to __repr__ objects	Michael Kaye	2019-10-24	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This avoids calculating __repr__ unless we are going to log.
\| * \| \| \| \|	Don't encode object as UTF-8 string if not needed.	Michael Kaye	2019-10-24	1	-2/+4
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I believe that string formatting ~10-15 sized events will take a proportion of CPU time.
* \| \| \| \|	Merge pull request #6250 from ↵	Erik Johnston	2019-10-25	2	-1/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/michaelkaye/make_user_stats_less_verbose Make user stats less verbose
\| * \| \| \|	Add missing '.'	Michael Kaye	2019-10-24	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add changelog.d	Michael Kaye	2019-10-24	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Make user/room stats log line less verbose.	Michael Kaye	2019-10-24	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #6248 from matrix-org/erikj/move_schema_files	Erik Johnston	2019-10-24	3	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Move schema delta files to the correct data store.
\| * \| \| \|	Newsfile	Erik Johnston	2019-10-24	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Move schema delta files to the correct data store.	Erik Johnston	2019-10-24	2	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They were put in the global schema delta directory due to a bad merge.
* \| \| \| \|	Merge pull request #6247 from matrix-org/babolivier/port_db_column	Brendan Abolivier	2019-10-24	2	-0/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Add new boolean column to synapse_port_db
\| * \| \| \|	Changelog	Brendan Abolivier	2019-10-24	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Add new boolean column to synapse_port_db	Brendan Abolivier	2019-10-24	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Fix up changelog v1.5.0rc1	Andrew Morgan	2019-10-24	2	-22/+27
\| \| \| \| \|
* \| \| \| \|	1.5.0rc1	Andrew Morgan	2019-10-24	63	-65/+80
\|/ / / /
* \| \| \|	Option to suppress resource exceeded alerting (#6173)	Neil Johnson	2019-10-24	8	-47/+161
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The expected use case is to suppress MAU limiting on small instances
* \| \| \|	Cleanup extra quotes from IDEs (#6236)	Andrew Morgan	2019-10-23	4	-5/+5
\| \| \| \|
* \| \| \|	Merge pull request #6243 from matrix-org/babolivier/port_db_fix_imports	Brendan Abolivier	2019-10-23	2	-11/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix import paths in synapse_port_db
\| * \| \| \|	Changelog	Brendan Abolivier	2019-10-23	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Fix import paths in synapse_port_db	Brendan Abolivier	2019-10-23	1	-11/+19
\|/ / / /
* \| \| \|	Make synapse_port_db correctly create indexes (#6102)	Brendan Abolivier	2019-10-23	2	-52/+131
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make `synapse_port_db` correctly create indexes in the PostgreSQL database, by having it run the background updates on the database before migrating the data. To ensure we're migrating the right data, also block the port if the SQLite3 database still has pending or ongoing background updates. Fixes #4877
\| \| * \|	Review comments	Erik Johnston	2019-10-30	6	-19/+37
\| \| \| \|
\| \| * \|	Newsfile	Erik Johnston	2019-10-23	1	-0/+1
\| \| \| \|
\| \| * \|	Use new EventPersistenceStore	Erik Johnston	2019-10-23	11	-19/+44
\| \| \| \|
\| \| * \|	Add DataStores and Storage classes.	Erik Johnston	2019-10-23	3	-4/+34
\| \| \| \|
\| \| * \|	Move persist_events out from main data store.	Erik Johnston	2019-10-23	2	-634/+711
\| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is in preparation for splitting out of state_groups_state from the main store into it own one, as persisting events depends on calculating state.
* \| \|	Add config linting script that checks for bool casing (#6203)	Andrew Morgan	2019-10-23	14	-30/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a linting script that enforces all boolean values in the default config be lowercase. This has annoyed me for a while so I decided to fix it.
* \| \|	Merge pull request #6231 from matrix-org/erikj/refactor_stores	Erik Johnston	2019-10-23	269	-4395/+4649
\|\ \ \ \| \|_\|/ \|/\| \|	Refactor storage layer to support multiple databases
\| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-22	8	-19/+783
\| \|\ \ \| \|/ / \|/\| \| \| \| \|	erikj/refactor_stores
* \| \|	Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2	Hubert Chathi	2019-10-22	5	-14/+774
\|\ \ \ \| \| \| \| \| \| \| \|	Cross-signing [3/4] -- uploading signatures edition
\| * \| \|	Add changelog entry	Hubert Chathi	2019-10-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... again? How did you make it disappear, git?
\| * \| \|	Merge branch 'develop' into cross-signing_sig_upload	Hubert Chathi	2019-10-18	354	-5244/+9522
\| \|\ \ \
\| * \| \| \|	fix doc strings	Hubert Chathi	2019-10-18	1	-9/+13
\| \| \| \| \|
\| * \| \| \|	make isort happy	Hubert Chathi	2019-09-24	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	add some comments	Hubert Chathi	2019-09-24	1	-2/+10
\| \| \| \| \|
\| * \| \| \|	drop some logger lines to debug	Hubert Chathi	2019-09-24	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	make changes based on PR feedback	Hubert Chathi	2019-09-24	2	-118/+165
\| \| \| \| \|
\| * \| \| \|	add function docs	Hubert Chathi	2019-09-07	1	-2/+24
\| \| \| \| \|
\| * \| \| \|	Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_sig_upload	Hubert Chathi	2019-09-07	0	-0/+0
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'develop' into cross-signing_sig_upload	Hubert Chathi	2019-09-07	61	-583/+1486
\| \|\ \ \ \ \
\| * \| \| \| \| \|	use something that's the right type for user_id	Hubert Chathi	2019-09-06	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	run black	Hubert Chathi	2019-09-06	1	-24/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	split out signature processing into separate functions	Hubert Chathi	2019-09-06	1	-195/+204
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	avoid modifying input parameter	Hubert Chathi	2019-09-05	1	-7/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix test	Hubert Chathi	2019-09-05	1	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	update with newer coding style	Hubert Chathi	2019-09-04	2	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add test	Hubert Chathi	2019-09-04	1	-0/+88
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	make isort happy	Hubert Chathi	2019-09-04	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	make black happy	Hubert Chathi	2019-09-04	4	-178/+141
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	allow uploading signatures of master key signed by devices	Hubert Chathi	2019-09-04	4	-85/+378
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	implement device signature uploading/fetching	Hubert Chathi	2019-09-04	3	-0/+338
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix demo script on ipv6-supported boxes (#6229)	Andrew Morgan	2019-10-22	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The synapse demo was a bit flakey in terms of supporting federation. It turns out that if your computer resolved `localhost` to `::1` instead of `127.0.0.1`, the built-in federation blacklist specified in `start.sh` would still block it, since it contained an entry for `::/127`. Removing this no longer prevents Synapse from contacting `::1`, federation works again on these boxes.
* \| \| \| \| \| \|	Update postgres.md (#6234)	Adrien Luxey	2019-10-22	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added database owner authentication with `sudo` when `su` does not work
\| \| \| \| \| * \|	Clean up prepare_database.py a bit and add comments	Erik Johnston	2019-10-22	1	-7/+30
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	Delete background_update table creation in main data_store	Erik Johnston	2019-10-22	1	-21/+0
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	Move README into synapse/storage/__init__.py	Erik Johnston	2019-10-22	2	-13/+12
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	Add a basic README to synapse.storage	Erik Johnston	2019-10-22	2	-0/+14
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	Fix postgres unit tests to use prepare_database	Erik Johnston	2019-10-22	1	-10/+2
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-22	29	-304/+707
\| \| \| \| \| \|\ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/refactor_stores
* \| \| \| \| \| \|	Delete format_tap.py (#6219)	Andrew Morgan	2019-10-19	2	-48/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Delete format_tap.py This python implementation of a tap formatting library for buildkite has been replaced with a perl implementation as part of the matrix-org/sytest repo, which is specific to sytest's language, not that of any one homeserver's.
* \| \| \| \| \| \|	Remove Auth.check method (#6217)	Richard van der Hoff	2019-10-18	3	-21/+6
\| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	This method was somewhat redundant, and confusing.
* \| \| \| \| \|	Merge branch 'uhoreg/e2e_cross-signing_merged' into develop	Hubert Chathi	2019-10-18	15	-21/+693
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'develop' into uhoreg/e2e_cross-signing_merged	Hubert Chathi	2019-10-18	346	-5021/+9505
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	add note about database upgrade	Hubert Chathi	2019-10-18	1	-1/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	use the right function for when we're already in runInteraction	Hubert Chathi	2019-10-18	1	-4/+4
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' into uhoreg/e2e_cross-signing_merged	Hubert Chathi	2019-09-07	61	-583/+1486
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge pull request #5769 from matrix-org/uhoreg/e2e_cross-signing2-part1	Hubert Chathi	2019-09-04	141	-1713/+2808
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|	Cross-signing [2/4] - upload/download keys
\| \| * \| \| \| \|	add user signature stream change cache to slaved device store	Hubert Chathi	2019-09-04	1	-0/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'develop' into cross-signing_keys	Hubert Chathi	2019-09-04	132	-1703/+2168
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys	Hubert Chathi	2019-08-28	207	-1510/+4979
\| \| \|\ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' into uhoreg/e2e_cross-signing_merged	Hubert Chathi	2019-08-28	206	-1438/+4695
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Cross-signing [1/4] -- hidden devices (#5759)	Hubert Chathi	2019-08-12	4	-10/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* allow devices to be marked as "hidden" This is a prerequisite for cross-signing, as it allows us to create other things that live within the device namespace, so they can be used for signatures.
\| \| \| * \| \| \| \| \|	black	Hubert Chathi	2019-08-28	1	-3/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	use stream ID generator instead of timestamp	Hubert Chathi	2019-08-28	4	-23/+23
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	make isort happy	Hubert Chathi	2019-08-21	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	apply PR review suggestions	Hubert Chathi	2019-08-21	4	-53/+46
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	fix formatting	Hubert Chathi	2019-08-01	2	-2/+4
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	add changelog	Hubert Chathi	2019-08-01	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	make changes from PR review	Hubert Chathi	2019-08-01	4	-49/+75
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge branch 'cross-signing_hidden' into cross-signing_keys	Hubert Chathi	2019-08-01	298	-2145/+3414
\| \| \| \|\ \ \ \ \ \
\| \| \| \| * \| \| \| \| \|	don't need to return the hidden column any more	Hubert Chathi	2019-08-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	really fix queries to work with Postgres	Hubert Chathi	2019-07-31	1	-19/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(by going back to not using SQL directly)
\| \| \| \| * \| \| \| \| \|	PostgreSQL, Y U no like?	Hubert Chathi	2019-07-31	1	-3/+4
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	remove extra SQL query param	Hubert Chathi	2019-07-31	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Merge branch 'develop' into cross-signing_hidden	Hubert Chathi	2019-07-30	298	-2125/+3402
\| \| \| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \|	Merge branch 'cross-signing_hidden' into cross-signing_keys	Hubert Chathi	2019-07-30	4	-21/+18
\| \| \| \|\\| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	add changelog file	Hubert Chathi	2019-07-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	apply changes from PR review	Hubert Chathi	2019-07-30	3	-20/+17
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	allow uploading keys for cross-signing	Hubert Chathi	2019-07-25	11	-12/+621
\| \| \| \|/ / / / / / /
\| \| \| * \| \| \| \| \| \|	allow devices to be marked as "hidden"	Hubert Chathi	2019-07-24	2	-16/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a prerequisite for cross-signing, as it allows us to create other things that live within the device namespace, so they can be used for signatures.
* \| \| \| \| \| \| \| \| \|	Merge pull request #6214 from matrix-org/rav/event_auth/1	Richard van der Hoff	2019-10-18	6	-211/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove a bunch of dead event_auth code.
\| * \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/develop' into rav/event_auth/1	Richard van der Hoff	2019-10-18	21	-152/+212
\| \|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Fix logging config for the docker image (#6197)	Richard van der Hoff	2019-10-18	3	-3/+5
\| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turns out that loggers that are instantiated before the config is loaded get turned off. Also bring the logging config that is generated by --generate-config into line. Fixes #6194.