16506 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brendan Abolivier	c9e4748cb7	Merge labels tests for /context and /messages	2019-11-05 13:47:47 +00:00
Richard van der Hoff	4086002827	Improve documentation for EventContext fields (#6319)	2019-11-05 13:23:25 +00:00
Brendan Abolivier	a7c818c79b	Add test case	2019-11-05 13:21:26 +00:00
Brendan Abolivier	1dffa78701	Filter events_before and events_after in /context requests ... While the current version of the spec doesn't say much about how this endpoint uses filters (see https://github.com/matrix-org/matrix-doc/issues/2338), the current implementation is that some fields of an EventFilter apply (the ones that are used when running the SQL query) and others don't (the ones that are used by the filter itself) because we don't call event_filter.filter(...). This seems counter-intuitive and probably not what we want so this commit fixes it.	2019-11-05 12:21:59 +00:00
Erik Johnston	ffe595381d	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history	2019-11-05 10:27:41 +00:00
Andrew Morgan	506a63de67	Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrade_groups	2019-11-04 18:22:41 +00:00
Andrew Morgan	c2203bea57	Re-add docstring, with caveats detailed	2019-11-04 18:17:11 +00:00
Brendan Abolivier	e252ffadbc	Merge branch 'develop' into babolivier/msc2326_bg_update	2019-11-04 18:09:50 +00:00
Andrew Morgan	0287d033ee	Transfer upgraded rooms on groups	2019-11-04 18:08:50 +00:00
Amber Brown	4e1c7b79fa	Remove the psutil dependency (#6318) ... * remove psutil and replace with resource	2019-11-05 05:05:48 +11:00
Brendan Abolivier	09957ce0e4	Implement per-room message retention policies	2019-11-04 17:09:22 +00:00
Erik Johnston	7134ca7daa	Change to not require a state_groups.room_id index. ... 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).	2019-11-04 13:36:57 +00:00
Erik Johnston	6a0092d371	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history	2019-11-04 13:29:35 +00:00
Richard van der Hoff	cc6243b4c0	document the REPLICATE command a bit better (#6305) ... since I found myself wonder how it works	2019-11-04 12:40:18 +00:00
Brendan Abolivier	3b29a73f9f	Print out the actual number of affected rows	2019-11-04 09:56:11 +00:00
Brendan Abolivier	824bba2f78	Correctly order results	2019-11-04 09:56:11 +00:00
Brendan Abolivier	49008e674f	TODO	2019-11-04 09:56:11 +00:00
Brendan Abolivier	1586f2c7e7	Fix exit condition	2019-11-04 09:56:11 +00:00
Brendan Abolivier	1c1268245d	Lint	2019-11-04 09:56:11 +00:00
Brendan Abolivier	416c7baee6	Changelog	2019-11-04 09:56:10 +00:00
Brendan Abolivier	911b03ca31	Don't try to process events we already have a label for	2019-11-04 09:56:10 +00:00
Brendan Abolivier	07cb38e965	Use a sensible default value for labels	2019-11-04 09:56:10 +00:00
Brendan Abolivier	a46574281d	Use the right format for rows	2019-11-04 09:56:10 +00:00
Brendan Abolivier	c9a1b80a74	MSC2326: Add background update to take previous events into account	2019-11-04 09:56:04 +00:00
Brendan Abolivier	f496d25877	Merge pull request #6301 from matrix-org/babolivier/msc2326 ... Implement MSC2326 (label based filtering)	2019-11-01 17:04:45 +00:00
Brendan Abolivier	988d8d6507	Incorporate review	2019-11-01 16:22:44 +00:00
Richard van der Hoff	c6516adbe0	Factor out an _AsyncEventContextImpl (#6298) ... 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.	2019-11-01 16:19:09 +00:00
Brendan Abolivier	5598445655	Update synapse/storage/data_stores/main/schema/delta/56/event_labels.sql ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-11-01 16:18:34 +00:00
Hubert Chathi	fa7e52caf1	Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schema ... fix hidden field in devices table for older sqlite	2019-11-01 10:52:46 -04:00
Jason Robinson	67a65918ad	Add contributer docs for using the provided linters script (#6164) ... * 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>	2019-11-02 01:45:09 +11:00
Richard van der Hoff	1cb84c6486	Support for routing outbound HTTP requests via a proxy (#6239) ... 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.	2019-11-01 14:07:44 +00:00
Andrew Morgan	fe1f2b4520	Remove last usages of deprecated logging.warn method (#6314)	2019-11-01 12:03:44 +00:00
Brendan Abolivier	a2c63c619a	Add more data to the event_labels table and fix the indexes	2019-11-01 11:47:28 +00:00
Erik Johnston	669b6cbda3	Fix up comment	2019-11-01 11:32:20 +00:00
Neil Pilgrim	befd58f47b	Document lint.sh & allow application to specified files only (#6312)	2019-11-01 10:52:20 +00:00
Brendan Abolivier	e3689ac6f7	Add unstable feature flag	2019-11-01 10:41:23 +00:00
Brendan Abolivier	57cdb046e4	Lint	2019-11-01 10:39:14 +00:00
Brendan Abolivier	c6dbca2422	Incorporate review	2019-11-01 10:30:51 +00:00
Andrew Morgan	ace947e8da	Depublish a room from the public rooms list when it is upgraded (#6232)	2019-11-01 10:28:09 +00:00
Hubert Chathi	53d7680e32	Merge pull request #5727 from matrix-org/uhoreg/e2e_cross-signing2-part3 ... Cross-signing [4/4] -- federation edition	2019-10-31 23:59:35 -04:00
Hubert Chathi	1f156398b9	add changelog	2019-10-31 23:02:20 -04:00
Hubert Chathi	c61db13183	fix hidden field in devices table for older sqlite	2019-10-31 22:52:55 -04:00
Hubert Chathi	c3fc176c60	Update synapse/storage/data_stores/main/devices.py ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-10-31 22:49:48 -04:00
Hubert Chathi	6f4bc6d01d	Merge branch 'develop' into cross-signing_federation	2019-10-31 22:38:21 -04:00
Hubert Chathi	3b4216f961	Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notify ... make notification of signatures work with workers	2019-10-31 22:35:03 -04:00
Will Hunt	42e707c663	rstrip slashes from url on appservice (#6306)	2019-10-31 17:32:25 +00:00
Hubert Chathi	9c94b48bf1	Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify	2019-10-31 12:32:07 -04:00
Hubert Chathi	f7e4a582ef	clean up code a bit	2019-10-31 12:01:00 -04:00
Erik Johnston	fb1a6914cf	Update log line to lie a little less	2019-10-31 15:45:48 +00:00
Amber Brown	020add5099	Update black to 19.10b0 (#6304) ... * update version of black and also fix the mypy config being overridden	2019-11-01 02:43:24 +11:00