15793 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brendan Abolivier	271c322d08	Lint	2019-11-20 09:29:48 +00:00
Brendan Abolivier	cdd3cb870d	Fix worker mode	2019-11-19 14:40:21 +00:00
Brendan Abolivier	a6fc6754f8	Fix 3PID invite exchange	2019-11-19 14:07:39 +00:00
Brendan Abolivier	97b863fe32	Lint again	2019-11-19 13:33:58 +00:00
Brendan Abolivier	bf9a11c54d	Lint again	2019-11-19 13:30:04 +00:00
Brendan Abolivier	7c24d0f443	Lint	2019-11-19 13:22:37 +00:00
Erik Johnston	c7376cdfe3	Apply suggestions from code review ... Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-Authored-By: Brendan Abolivier <babolivier@matrix.org>	2019-11-18 17:10:16 +00:00
Richard van der Hoff	870c00e278	Merge remote-tracking branch 'origin/develop' into rav/event_auth/4	2019-11-18 12:05:36 +00:00
Andrew Morgan	657d614f6a	Replace UPDATE with UPSERT on device_max_stream_id table (#6363)	2019-11-15 14:02:34 +00:00
James	53b6559a89	Add optional python dependencies to snap packaging (#6317) ... Signed-off-by: James Hebden <james@ec0.io>	2019-11-14 18:42:46 +00:00
Andrew Morgan	745a48625d	Fix guest -> real account upgrade with account validity enabled (#6359)	2019-11-14 12:02:05 +00:00
Andrew Morgan	6e1b40dc26	Replace instance variations of homeserver with correct case/spacing (#6357)	2019-11-14 11:02:58 +00:00
Andrew Morgan	a65a5ea125	Merge branch 'develop' of github.com:matrix-org/synapse into anoa/fix_account_data_sync ... * 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5	2019-11-14 10:26:56 +00:00
Andrew Morgan	473acedcdd	Merge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_copy ... * 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5	2019-11-14 10:26:27 +00:00
Brendan Abolivier	a42567e4a8	Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 ... Set room version default to 5	2019-11-14 10:21:00 +00:00
Andrew Morgan	c350bc2f92	Blacklist PurgeRoomTestCase (#6361)	2019-11-13 19:09:20 +00:00
Andrew Morgan	e1648dc576	sample config	2019-11-12 13:15:59 +00:00
Andrew Morgan	85f172ef96	Add changelog	2019-11-12 13:13:19 +00:00
Andrew Morgan	73d091be48	A couple more instances	2019-11-12 13:12:25 +00:00
Andrew Morgan	bc29a19731	Replace instance variations of homeserver with correct case/spacing	2019-11-12 13:08:12 +00:00
Richard van der Hoff	20d687516f	newsfile	2019-11-08 16:17:02 +00:00
Andrew Morgan	cd96b4586f	lint	2019-11-08 15:45:45 +00:00
Andrew Morgan	318dd21b47	Add changelog	2019-11-08 15:45:08 +00:00
Andrew Morgan	c4bdf2d785	Remove content from being sent for account data rdata stream	2019-11-08 15:44:02 +00:00
Richard van der Hoff	f41027f746	Use get_events_as_list rather than lots of calls to get_event ... It's more efficient and clearer.	2019-11-08 12:21:28 +00:00
Richard van der Hoff	f8407975e7	Update some docstrings and comments	2019-11-08 12:18:20 +00:00
Richard van der Hoff	772d414975	Simplify _update_auth_events_and_context_for_auth ... move event_key calculation into _update_context_for_auth_events, since it's only used there.	2019-11-08 11:40:11 +00:00
Brendan Abolivier	963ffb60b9	Merge pull request #6340 from matrix-org/babolivier/pagination_query ... Fix the SQL SELECT query in _paginate_room_events_txn	2019-11-08 11:12:24 +00:00
Brendan Abolivier	b16fa43386	Incorporate review	2019-11-08 10:34:09 +00:00
Erik Johnston	f713c01e2b	Merge pull request #6295 from matrix-org/erikj/split_purge_history ... Split purge API into events vs state and add PurgeEventsStorage	2019-11-08 10:19:15 +00:00
Erik Johnston	e4ec82ce0f	Move type annotation into docstring	2019-11-08 09:50:48 +00:00
Brendan Abolivier	46e5db9eb2	Merge pull request #6310 from matrix-org/babolivier/msc2326_bg_update ... MSC2326: Add background update to take previous events into account	2019-11-07 22:54:56 +00:00
Richard van der Hoff	c5abb67e43	Python 3.8 for tox (#6341) ... ... and update INSTALL.md to include py3.8. We'll also have to update the buildkite pipeline to run it	2019-11-07 17:14:13 +00:00
Brendan Abolivier	dad8d68c99	Update synapse/storage/data_stores/main/events_bg_updates.py ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-11-07 17:01:53 +00:00
Brendan Abolivier	6d360f099f	Update synapse/storage/data_stores/main/events_bg_updates.py ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-11-07 17:01:43 +00:00
Brendan Abolivier	c9b27d0044	Copy results	2019-11-07 16:47:45 +00:00
Brendan Abolivier	cd31201267	Revert "Back to using cursor_to_dict" ... This reverts commit 1186612d6c.	2019-11-07 16:47:15 +00:00
Brendan Abolivier	1186612d6c	Back to using cursor_to_dict	2019-11-07 16:46:41 +00:00
Brendan Abolivier	ec2cb9f298	Initialise value before looping	2019-11-07 16:18:40 +00:00
Brendan Abolivier	bb78276bdc	Incorporate review	2019-11-07 15:25:27 +00:00
Brendan Abolivier	b9cba07962	Lint	2019-11-07 14:57:15 +00:00
Brendan Abolivier	70804392ae	Only join on event_labels if we're filtering on labels	2019-11-07 14:55:10 +00:00
Brendan Abolivier	15a1a02e70	Handle lack of filter	2019-11-07 12:04:37 +00:00
Brendan Abolivier	4f519d556e	Changelog	2019-11-07 11:51:54 +00:00
Brendan Abolivier	3f9b61ff95	Fix the SQL SELECT query in _paginate_room_events_txn ... 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.	2019-11-07 11:51:11 +00:00
Andrew Morgan	e914cf12f6	Merge pull request #6235 from matrix-org/anoa/room_upgrade_groups	2019-11-07 11:12:22 +00:00
Richard van der Hoff	b03cddaeb9	tweak changelog	2019-11-07 09:46:25 +00:00
V02460	affcc2cc36	Fix LruCache callback deduplication (#6213)	2019-11-07 09:43:51 +00:00
Brendan Abolivier	f03c9d3444	Don't apply retention policy based filtering on state events ... As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy.	2019-11-06 18:40:04 +00:00
Brendan Abolivier	eda14737cf	Also filter state events	2019-11-06 18:14:03 +00:00