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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \|	Fix find_next_generated_user_id_localpart	Erik Johnston	2019-11-26	1	-10/+7
\| \| \| \| \|
\| * \| \| \|	Prevent account_data content from being sent over TCP replication (#6333)	Andrew Morgan	2019-11-26	1	-3/+3
\| \|\ \ \ \
\| \| * \| \| \|	Remove content from being sent for account data rdata stream	Andrew Morgan	2019-11-08	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Make sure that we close cursors before returning from a query (#6408)	Richard van der Hoff	2019-11-25	2	-10/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There are lots of words in the comment as to why this is a good idea. Fixes #6403.
\| * \| \| \| \|	Merge tag 'v1.6.0rc2' into develop	Richard van der Hoff	2019-11-25	1	-18/+25
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Synapse 1.6.0rc2 (2019-11-25) ============================= Bugfixes -------- - Fix a bug which could cause the background database update hander for event labels to get stuck in a loop raising exceptions. ([\#6407](https://github.com/matrix-org/synapse/issues/6407))
\| * \| \| \| \|	Clean up newline quote marks around the codebase (#6362)	Andrew Morgan	2019-11-21	10	-22/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'release-v1.6.0' of github.com:matrix-org/synapse into ↵	Andrew Morgan	2019-11-26	1	-18/+25
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|	matrix-org-hotfixes
\| * \| \| \| \|	Fix exceptions from background database update for event labels. (#6407)	Richard van der Hoff	2019-11-25	1	-18/+25
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some exception handling here so that events whose json cannot be parsed are ignored rather than getting us stuck in a loop. Fixes #6404.
* \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2019-11-19	30	-901/+1780
\|\\| \| \| \|
\| * \| \| \|	Replace UPDATE with UPSERT on device_max_stream_id table (#6363)	Andrew Morgan	2019-11-15	1	-2/+15
\| \| \| \| \|
\| * \| \| \|	Fix guest -> real account upgrade with account validity enabled (#6359)	Andrew Morgan	2019-11-14	1	-6/+3
\| \|/ / /
\| * \| \|	Merge pull request #6340 from matrix-org/babolivier/pagination_query	Brendan Abolivier	2019-11-08	1	-8/+32
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Fix the SQL SELECT query in _paginate_room_events_txn
\| \| * \| \|	Incorporate review	Brendan Abolivier	2019-11-08	1	-12/+12
\| \| \| \| \|
\| \| * \| \|	Lint	Brendan Abolivier	2019-11-07	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	Only join on event_labels if we're filtering on labels	Brendan Abolivier	2019-11-07	1	-9/+24
\| \| \| \| \|
\| \| * \| \|	Handle lack of filter	Brendan Abolivier	2019-11-07	1	-5/+3
\| \| \| \| \|
\| \| * \| \|	Fix the SQL SELECT query in _paginate_room_events_txn	Brendan Abolivier	2019-11-07	1	-2/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doing a SELECT DISTINCT when paginating is quite expensive, because it requires the engine to do sorting on the entire events table. However, we only need to run it if we're filtering on 2+ labels, so this PR is changing the request so that DISTINCT is only used then.
\| * \| \| \|	Merge pull request #6295 from matrix-org/erikj/split_purge_history	Erik Johnston	2019-11-08	4	-172/+319
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Split purge API into events vs state and add PurgeEventsStorage
\| \| * \| \| \|	Move type annotation into docstring	Erik Johnston	2019-11-08	1	-3/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Fix deleting state groups during room purge.	Erik Johnston	2019-11-06	1	-13/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And fix the tests to actually test that things got deleted.
\| \| * \| \| \|	Use correct type annotation	Erik Johnston	2019-11-06	1	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	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	18	-54/+259
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \| \| \| \| \| \| \|	erikj/split_purge_history
\| \| * \| \| \|	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	7	-12/+243
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/split_purge_history
\| \| * \| \| \| \|	Split purge API into events vs state	Erik Johnston	2019-10-30	4	-175/+295
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #6310 from matrix-org/babolivier/msc2326_bg_update	Brendan Abolivier	2019-11-07	2	-0/+80
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MSC2326: Add background update to take previous events into account
\| \| * \| \| \| \| \|	Update synapse/storage/data_stores/main/events_bg_updates.py	Brendan Abolivier	2019-11-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
\| \| * \| \| \| \| \|	Update synapse/storage/data_stores/main/events_bg_updates.py	Brendan Abolivier	2019-11-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
\| \| * \| \| \| \| \|	Copy results	Brendan Abolivier	2019-11-07	1	-1/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Revert "Back to using cursor_to_dict"	Brendan Abolivier	2019-11-07	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1186612d6cd728e6b7ed7806579db3cea7410b54.
\| \| * \| \| \| \| \|	Back to using cursor_to_dict	Brendan Abolivier	2019-11-07	1	-9/+9
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Initialise value before looping	Brendan Abolivier	2019-11-07	1	-4/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Incorporate review	Brendan Abolivier	2019-11-07	1	-14/+9
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix field name	Brendan Abolivier	2019-11-06	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Update insert	Brendan Abolivier	2019-11-06	1	-1/+6
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Print out the actual number of affected rows	Brendan Abolivier	2019-11-04	1	-4/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Correctly order results	Brendan Abolivier	2019-11-04	1	-5/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	TODO	Brendan Abolivier	2019-11-04	1	-0/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix exit condition	Brendan Abolivier	2019-11-04	1	-1/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Lint	Brendan Abolivier	2019-11-04	1	-6/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Don't try to process events we already have a label for	Brendan Abolivier	2019-11-04	1	-1/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Use a sensible default value for labels	Brendan Abolivier	2019-11-04	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Use the right format for rows	Brendan Abolivier	2019-11-04	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	MSC2326: Add background update to take previous events into account	Brendan Abolivier	2019-11-04	2	-0/+72
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge pull request #6235 from matrix-org/anoa/room_upgrade_groups	Andrew Morgan	2019-11-07	2	-1/+20
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Re-add docstring, with caveats detailed	Andrew Morgan	2019-11-04	2	-2/+6
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Transfer upgraded rooms on groups	Andrew Morgan	2019-11-04	1	-0/+15
\| \| \|/ / / / /
\| * \| \| \| / /	Numeric ID checker now checks @0, don't ratelimit on checking	Andrew Morgan	2019-11-06	1	-4/+4
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Fix bug which caused rejected events to be stored with the wrong room state ↵	Richard van der Hoff	2019-11-06	1	-1/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(#6320) Fixes a bug where rejected events were persisted with the wrong state group. Also fixes an occasional internal-server-error when receiving events over federation which are rejected and (possibly because they are backwards-extremities) have no prev_group. Fixes #6289.
\| * \| \| \|	Merge pull request #6301 from matrix-org/babolivier/msc2326	Brendan Abolivier	2019-11-01	3	-2/+75
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Implement MSC2326 (label based filtering)
\| \| * \| \| \|	Incorporate review	Brendan Abolivier	2019-11-01	2	-1/+7
\| \| \| \| \| \|
\| \| * \| \| \|	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
\| \| \| \| \| \|
\| \| * \| \| \|	Lint	Brendan Abolivier	2019-11-01	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Incorporate review	Brendan Abolivier	2019-11-01	1	-2/+10
\| \| \| \| \| \|
\| \| * \| \| \|	Lint	Brendan Abolivier	2019-10-30	1	-7/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Add more integration testing	Brendan Abolivier	2019-10-30	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Add index on label	Brendan Abolivier	2019-10-30	1	-1/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Implement filtering	Brendan Abolivier	2019-10-30	1	-0/+9
\| \| \| \| \| \|
\| \| * \| \| \|	Store labels for new events	Brendan Abolivier	2019-10-30	1	-1/+19
\| \| \| \| \| \|
\| \| * \| \| \|	Add database table for keeping track of labels on events	Brendan Abolivier	2019-10-29	1	-0/+20
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schema	Hubert Chathi	2019-11-01	1	-0/+42
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix hidden field in devices table for older sqlite
\| \| * \| \| \| \|	fix hidden field in devices table for older sqlite	Hubert Chathi	2019-10-31	1	-0/+42
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	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	19	-40/+300
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify	Hubert Chathi	2019-10-31	18	-39/+272
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	Update black to 19.10b0 (#6304)	Amber Brown	2019-11-01	13	-27/+29
\| \| \| \| \|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|	* update version of black and also fix the mypy config being overridden
\| \| \| * \| \| \|	Merge pull request #6294 from matrix-org/erikj/add_state_storage	Erik Johnston	2019-10-31	3	-1/+236
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
\| \| \| \| * \| \| \|	Add StateGroupStorage interface	Erik Johnston	2019-10-30	3	-1/+235
\| \| \| \| \| \|/ / \| \| \| \| \|/\| \|
\| \| \| * \| \| \|	Fix /purge_room API.	Erik Johnston	2019-10-31	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It fails trying to clean the `topic` table which was recently removed.
\| \| \| * \| \| \|	Remove usage of deprecated logger.warn method from codebase (#6271)	Andrew Morgan	2019-10-31	3	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-5/+2
\| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	this is part of _retry_on_integrity_error, so should only be on _persist_events_and_state_updates
\| \| * \| \| \|	make user signatures a separate stream	Hubert Chathi	2019-10-30	2	-12/+25
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify	Hubert Chathi	2019-10-30	13	-724/+889
\| \| \|\\| \| \|
\| \| * \| \| \|	make notification of signatures work with workers	Hubert Chathi	2019-10-24	2	-2/+16
\| \| \| \| \| \|
\| * \| \| \| \|	rename get_devices_by_remote to get_device_updates_by_remote	Hubert Chathi	2019-10-30	1	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' into cross-signing_federation	Hubert Chathi	2019-10-30	12	-657/+822
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-30	12	-84/+126
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/split_out_persistence_store
\| \| \| * \| \| \|	Port receipt and read markers to async/wait	Erik Johnston	2019-10-29	1	-4/+3
\| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| \| * \| \|	Merge pull request #6263 from matrix-org/erikj/caches_return_deferreds	Erik Johnston	2019-10-29	1	-1/+1
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quick fix to ensure cache descriptors always return deferreds
\| \| \| \| * \| \|	Quick fix to ensure cache descriptors always return deferreds	Erik Johnston	2019-10-28	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2019-10-29	1	-4/+8
\| \| \| \|\ \ \ \
\| \| \| * \| \| \| \|	Add CI for synapse_port_db (#6140)	Brendan Abolivier	2019-10-28	1	-3/+6
\| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| \| \| * \| \| \|	Convert EventContext to attrs (#6218)	Richard van der Hoff	2019-10-28	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* make EventContext use an attr
\| \| \| * \| \| \|	Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keys	Hubert Chathi	2019-10-25	2	-0/+33
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	delete keys when deleting backup versions
\| \| \| \| * \| \| \|	delete keys when deleting backups	Hubert Chathi	2019-10-24	2	-0/+33
\| \| \| \| \| \|/ / \| \| \| \| \|/\| \|
\| \| * \| \| \| \|	Review comments	Erik Johnston	2019-10-30	3	-10/+26
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	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.
\| * \| \| \| \| \|	apply changes as a result of PR review	Hubert Chathi	2019-10-30	1	-43/+36
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' into cross-signing_federation	Hubert Chathi	2019-10-24	241	-4341/+4597
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	move get_e2e_cross_signing_key to EndToEndKeyWorkerStore so it works with ↵	Hubert Chathi	2019-10-23	1	-67/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	workers
\| * \| \| \| \| \|	vendor-prefix the EDU name until MSC1756 is merged into the spec	Hubert Chathi	2019-10-22	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	update to work with newer code, and fix formatting	Hubert Chathi	2019-10-22	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	make black happy	Hubert Chathi	2019-10-22	1	-22/+32
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	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	1	-5/+51
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-29	1	-4/+8
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	matrix-org-hotfixes
\| * \| \| \| \| \|	Make room directory search case insensitive	Erik Johnston	2019-10-29	1	-4/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2019-10-25	1	-67/+67
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2019-10-25	1	-67/+67
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2019-10-25	241	-4353/+4967
\|\\| \| \| \| \|
\| * \| \| \| \|	Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_logging	Erik Johnston	2019-10-25	1	-3/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce debug logging overhead
\| \| * \| \| \| \|	Address codestyle concerns	Michael Kaye	2019-10-24	1	-3/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	use %r to __repr__ objects	Michael Kaye	2019-10-24	1	-1/+1
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This avoids calculating __repr__ unless we are going to log.
\| * / / / /	Make user/room stats log line less verbose.	Michael Kaye	2019-10-24	1	-1/+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 branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-22	1	-11/+37
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/refactor_stores
\| \| * \|	Merge branch 'develop' into cross-signing_sig_upload	Hubert Chathi	2019-10-18	38	-908/+1949
\| \| \|\ \
\| \| * \| \|	make changes based on PR feedback	Hubert Chathi	2019-09-24	1	-11/+6
\| \| \| \| \|
\| \| * \| \|	Merge branch 'develop' into cross-signing_sig_upload	Hubert Chathi	2019-09-07	4	-81/+142
\| \| \|\ \ \
\| \| * \| \| \|	make black happy	Hubert Chathi	2019-09-04	1	-15/+9
\| \| \| \| \| \|
\| \| * \| \| \|	allow uploading signatures of master key signed by devices	Hubert Chathi	2019-09-04	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	implement device signature uploading/fetching	Hubert Chathi	2019-09-04	1	-0/+38
\| \| \| \| \| \|
\| * \| \| \| \|	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	1	-0/+13
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-22	6	-12/+337
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \|	erikj/refactor_stores
\| \| * \| \| \|	Merge branch 'develop' into uhoreg/e2e_cross-signing_merged	Hubert Chathi	2019-10-18	38	-903/+1945
\| \| \|\ \ \ \
\| \| * \| \| \| \|	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	4	-81/+142
\| \| \|\ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| / / \| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| * \| \| \|	Merge branch 'develop' into cross-signing_keys	Hubert Chathi	2019-09-04	16	-377/+958
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys	Hubert Chathi	2019-08-28	14	-328/+653
\| \| \|\ \ \ \ \
\| \| \| * \ \ \ \	Merge branch 'develop' into uhoreg/e2e_cross-signing_merged	Hubert Chathi	2019-08-28	14	-307/+632
\| \| \| \|\ \ \ \ \
\| \| \| * \| \| \| \| \|	Cross-signing [1/4] -- hidden devices (#5759)	Hubert Chathi	2019-08-12	3	-10/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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.
\| \| * \| \| \| \| \| \|	use stream ID generator instead of timestamp	Hubert Chathi	2019-08-28	3	-19/+20
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	apply PR review suggestions	Hubert Chathi	2019-08-21	2	-10/+11
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	make changes from PR review	Hubert Chathi	2019-08-01	2	-41/+55
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'cross-signing_hidden' into cross-signing_keys	Hubert Chathi	2019-08-01	40	-452/+566
\| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	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	40	-432/+554
\| \| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'cross-signing_hidden' into cross-signing_keys	Hubert Chathi	2019-07-30	3	-21/+17
\| \| \|\\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	apply changes from PR review	Hubert Chathi	2019-07-30	3	-20/+17
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	allow uploading keys for cross-signing	Hubert Chathi	2019-07-25	4	-3/+274
\| \| \|/ / / / / / / /
\| \| * \| \| \| \| \| \| \|	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.
\| * \| \| \| \| \| \| \| \|	Fix schema management to work with multiple data stores.	Erik Johnston	2019-10-21	1	-41/+108
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Move storage classes into a main "data store".	Erik Johnston	2019-10-21	239	-4292/+4466
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is in preparation for having multiple data stores that offer different functionality, e.g. splitting out state or event storage.
\| * \| \| \| \| \| \| \|	Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage	Hubert Chathi	2019-10-11	1	-4/+14
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make storage layer in charge of interpreting the device key data
\| \| * \| \| \| \| \| \| \|	expand on comment	Hubert Chathi	2019-10-11	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	make sure we actually return something	Hubert Chathi	2019-10-10	1	-2/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	make storage layer in charge of interpreting the device key data	Hubert Chathi	2019-10-10	1	-2/+9
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2019-10-11	26	-772/+1089
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix MAU reaping where reserved users are specified. (#6168)	Neil Johnson	2019-10-11	1	-39/+62
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #6156 from matrix-org/erikj/postgres_any	Erik Johnston	2019-10-10	14	-109/+189
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Postgres ANY for selecting many values.
\| \| * \| \| \| \| \| \| \| \|	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	1	-3/+4
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This means that we can write queries with `col = ANY(?)`, which helps postgres.
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-10	1	-3/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/disable_sql_bytes
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner	Erik Johnston	2019-10-10	2	-35/+61
\| \| \|\\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner	Erik Johnston	2019-10-09	23	-706/+1180
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Patch inlinecallbacks for log contexts	Erik Johnston	2019-09-27	2	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-10	16	-725/+1030
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/disable_sql_bytes
\| \| * \| \| \| \| \| \| \| \| \|	Fix races in room stats (and other) updates. (#6187)	Richard van der Hoff	2019-10-10	1	-9/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hopefully this will fix the occasional failures we were seeing in the room directory. The problem was that events are not necessarily persisted (and `current_state_delta_stream` updated) in the same order as their stream_id. So for instance current_state_delta 9 might be persisted before current_state_delta 8. Then, when the room stats saw stream_id 9, it assumed it had done everything up to 9, and never came back to do stream_id 8. We can solve this easily by only processing up to the stream_id where we know all events have been persisted.
\| \| * \| \| \| \| \| \| \| \| \|	Rewrite the user_filter migration again (#6184)	Richard van der Hoff	2019-10-10	1	-26/+32
\| \| \| \|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	you can't plausibly ALTER TABLE in sqlite, so we create the new table with the right schema to start with.
\| \| * \| \| \| \| \| \| \| \|	Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets	Erik Johnston	2019-10-09	2	-4/+28
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inserting bytes as text in `censor_redactions`
\| \| * \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	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 some logging to the rooms stats updates, to try to track down a flaky ↵	Richard van der Hoff	2019-10-07	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test (#6167)
\| \| * \| \| \| \| \| \| \| \| \|	Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_index	Brendan Abolivier	2019-10-07	1	-2/+2
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix unique_user_filter_index schema update
\| \| \| * \| \| \| \| \| \| \| \| \|	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	Erik Johnston	2019-10-07	1	-19/+45
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|	Cache room membership lookups in _get_joined_users_from_context
\| \| * \| \| \| \| \| \| \| \| \| \|	Update `user_filters` table to have a unique index, and non-null columns (#1172)	Alexander Maznev	2019-10-04	1	-0/+46
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More often than not passing bytes to `txn.execute` is a bug (where we meant to pass a string) that just happens to work if `BYTEA_OUTPUT` is set to `ESCAPE`. However, this is a bit of a footgun so we want to instead error when this happens, and force using `bytearray` if we actually want to use bytes.
\| * \| \| \| \| \| \| \| \| \| \|	Fix existing hex encoded json values in DB	Erik Johnston	2019-10-08	1	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix inserting bytes as text	Erik Johnston	2019-10-08	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'erikj/cache_memberships' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-07	1	-19/+45
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org-hotfixes
\| * \| \| \| \| \| \| \| \| \| \|	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 ↵	Erik Johnston	2019-10-03	1	-6/+15
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/cache_memberships
\| * \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Cache room membership lookups in _get_joined_users_from_context	Erik Johnston	2019-10-03	1	-19/+45
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into matrix-org-hotfixes	Richard van der Hoff	2019-10-03	1	-6/+15
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	add some metrics on the federation sender (#6160)	Richard van der Hoff	2019-10-03	1	-6/+15
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2019-10-02	2	-19/+24
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #6154 from matrix-org/erikj/fix_appservice_pagination	Erik Johnston	2019-10-02	1	-18/+18
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix appservice room list pagination
\| \| * \| \| \| \| \| \| \| \| \|	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	Erik Johnston	2019-10-02	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix not showing non-federatable rooms to remote room list queries
\| \| * \| \| \| \| \| \| \| \| \| \|	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	Erik Johnston	2019-10-02	1	-1/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|	Bound find_next_generated_user_id DB query.
\| \| * \| \| \| \| \| \| \| \| \|	Bound find_next_generated_user_id DB query.	Erik Johnston	2019-10-02	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We can easily bound the set of user IDs we pull out of the DB, so lets do that.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2019-10-02	1	-17/+36
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix public room list pagination.	Erik Johnston	2019-10-02	1	-17/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We incorrectly used `room_id` as to bound the result set, even though we order by `joined_members, room_id`, leading to incorrect results after pagination.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2019-10-02	4	-87/+193
\|\\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Land improved room list based on room stats (#6019)	Erik Johnston	2019-10-02	2	-77/+167
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use room_stats and room_state for room directory search
\| * \| \| \| \| \| \| \| \| \| \|	Fix yields and copy instead of move push rules on room upgrade (#6144)	Andrew Morgan	2019-10-02	1	-10/+6
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copy push rules during a room upgrade from the old room to the new room, instead of deleting them from the old room. For instance, we've defined upgrading of a room multiple times to be possible, and push rules won't be transferred on the second upgrade if they're deleted during the first. Also fix some missing yields that probably broke things quite a bit.
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2019-10-02	5	-18/+142
\| \|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'erikj/fixup_devices_last_seen_query' of ↵	Erik Johnston	2019-10-01	3	-7/+54
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:matrix-org/synapse into develop
\| * \| \| \| \| \| \| \| \| \| \|	Drop unused tables (#6115)	Richard van der Hoff	2019-09-30	1	-0/+20
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These tables are unused since #5893 (as amended by #6047), so we can now drop them. Fixes #6048.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-02	8	-25/+196
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org-hotfixes
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings	Erik Johnston	2019-10-02	1	-0/+18
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix errors storing large retry intervals.
\| \| * \| \| \| \| \| \| \| \| \|	Fix errors storing large retry intervals.	Erik Johnston	2019-10-02	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have set the max retry interval to a value larger than a postgres or sqlite int can hold, which caused exceptions when updating the destinations table. To fix postgres we need to change the column to a bigint, and for sqlite we lower the max interval to 2**62 (which is still incredibly long).
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6145 from matrix-org/erikj/fix_censored_redactions	Erik Johnston	2019-10-02	1	-0/+14
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|	Fix fetching censored redactions from DB
\| \| * \| \| \| \| \| \| \| \| \|	Fix fetching censored redactions from DB	Erik Johnston	2019-10-02	1	-0/+14
\| \| \| \|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetching a censored redactions caused an exception due to the code expecting redactions to have a `redact` key, which redacted redactions don't have.
\| * \| \| \| \| \| \| \| \| \|	Use `received_ts` to find uncensored redacted events	Erik Johnston	2019-10-01	1	-14/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Joining against `events` and ordering by `stream_ordering` is inefficient as it forced scanning the entirety of the redactions table. This isn't the case if we use `redactions.received_ts` column as we can then use an index.
\| * \| \| \| \| \| \| \| \| \|	Add received_ts column to redactions.	Erik Johnston	2019-10-01	3	-9/+92
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will allow us to efficiently search for uncensored redactions in the DB before a given time.
\| * \| \| \| \| \| \| \| \| \|	Don't repeatedly attempt to censor events we don't have.	Erik Johnston	2019-10-01	1	-1/+17
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently we don't set `have_censored` column if we don't have the target event of a redaction, which means we repeatedly attempt to censor the same non-existant event. When we persist non-redacted events we unset the `have_censored` column for any redactions that target said event.
\| * / / / / / / / /	Fix `devices_last_seen` background update.	Erik Johnston	2019-09-30	3	-7/+54
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #6134.
* \| \| \| \| \| \| \| \|	Merge branch 'develop' into matrix-org-hotfixes	Richard van der Hoff	2019-09-26	4	-61/+189
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix dummy event insertion consent bug (#6053)	Neil Johnson	2019-09-26	1	-3/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #5905
\| * \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-09-25	4	-9/+94
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/cleanup_user_ips_2
\| \| * \ \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-09-25	3	-8/+93
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/cleanup_user_ips
\| \| * \| \| \| \| \| \| \| \|	Use if `is not None`	Erik Johnston	2019-09-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
\| * \| \| \| \| \| \| \| \| \|	Review comments	Erik Johnston	2019-09-25	2	-5/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Prune rows in user_ips older than configured period	Erik Johnston	2019-09-24	1	-8/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Defaults to pruning everything older than 28d.
\| * \| \| \| \| \| \| \| \| \|	Add has_completed_background_update	Erik Johnston	2019-09-24	1	-1/+24
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows checking if a specific background update has completed.
\| * \| \| \| \| \| \| \| \|	Query devices table for last seen info.	Erik Johnston	2019-09-23	1	-49/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a) simpler than querying user_ips directly and b) means we can purge older entries from user_ips without losing the required info. The storage functions now no longer return the access_token, since it was unused.
\| * \| \| \| \| \| \| \| \|	Add BG update to populate devices last seen info	Erik Johnston	2019-09-23	2	-0/+55
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add last seen info to devices table.	Erik Johnston	2019-09-23	2	-0/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to purge old user_ips entries without having to preserve the latest last seen info for active devices.
* \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into matrix-org-hotfixes	Richard van der Hoff	2019-09-25	2	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #6092 from ↵	Brendan Abolivier	2019-09-24	2	-6/+6
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/babolivier/background_update_deactivated_return Fix the return value in the users_set_deactivated_flag background job
\| \| * \| \| \| \| \| \| \| \|	Incorporate review	Brendan Abolivier	2019-09-24	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix logging	Brendan Abolivier	2019-09-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Typo	Brendan Abolivier	2019-09-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix the return value in the users_set_deactivated_flag background job	Brendan Abolivier	2019-09-23	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes	Richard van der Hoff	2019-09-24	2	-1/+66
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work	Richard van der Hoff	2019-09-24	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	remove unused parameter to get_user_id_by_threepid (#6099)	Richard van der Hoff	2019-09-24	1	-1/+1
\| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added in #5377, apparently in error
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work	Richard van der Hoff	2019-09-24	2	-28/+45
\| \|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into rav/saml_mapping_work	Richard van der Hoff	2019-09-19	28	-552/+1649
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Record mappings from saml users in an external table	Richard van der Hoff	2019-09-13	2	-0/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to assign unique mxids to saml users based on an incrementing suffix. For that to work, we need to record the allocated mxid in a separate table.
* \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes	Richard van der Hoff	2019-09-24	1	-8/+45
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Implement MSC2290 (#6043)	Andrew Morgan	2019-09-23	1	-1/+21
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implements MSC2290. This PR adds two new endpoints, /unstable/account/3pid/add and /unstable/account/3pid/bind. Depending on the progress of that MSC the unstable prefix may go away. This PR also removes the blacklist on some 3PID tests which occurs in #6042, as the corresponding Sytest PR changes them to use the new endpoints. Finally, it also modifies the account deactivation code such that it doesn't just try to deactivate 3PIDs that were bound to the user's account, but any 3PIDs that were bound through the homeserver on that user's account.