15586 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Amber Brown	4e1c7b79fa	Remove the psutil dependency (#6318) ... * remove psutil and replace with resource	2019-11-05 05:05:48 +11: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	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
Erik Johnston	61be1a2926	Add state_groups.room_id index	2019-10-31 15:39:26 +00:00
Erik Johnston	f91f2a1f92	Docstrings	2019-10-31 15:26:00 +00:00
Erik Johnston	8f5bbdb987	Fix purge room API	2019-10-31 15:22:08 +00:00
Erik Johnston	cd581338cf	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history	2019-10-31 15:19:26 +00:00
Erik Johnston	dfe0cd71b6	Merge pull request #6294 from matrix-org/erikj/add_state_storage ... Add StateGroupStorage interface	2019-10-31 16:17:53 +01:00
Travis Ralston	3a74c03ffb	Expose some homeserver functionality to spam checkers (#6259) ... * 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	2019-10-31 09:16:14 -06:00
Erik Johnston	69489f8eb1	Merge pull request #6307 from matrix-org/erikj/fix_purge_room ... Fix /purge_room admin API	2019-10-31 16:08:34 +01:00
Erik Johnston	64f2b8c3d8	Apply suggestions from code review ... Fix docstring Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-10-31 15:44:31 +01:00
Erik Johnston	b2ff8c305f	Newsfile	2019-10-31 11:32:53 +00:00
Erik Johnston	97c60ccaa3	Add unit test for /purge_room API	2019-10-31 11:30:25 +00:00
Erik Johnston	c6bcd38841	Fix /purge_room API. ... It fails trying to clean the `topic` table which was recently removed.	2019-10-31 11:17:23 +00:00
Richard van der Hoff	eb9a0d9e48	Merge remote-tracking branch 'origin/master' into develop	2019-10-31 11:17:05 +00:00
Andrew Morgan	54fef094b3	Remove usage of deprecated logger.warn method from codebase (#6271) ... Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated.	2019-10-31 10:23:24 +00:00
Hubert Chathi	998f7fe7d4	make user signatures a separate stream	2019-10-30 17:22:52 -04:00
Hubert Chathi	670972c0e1	Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify	2019-10-30 16:46:31 -04:00
Hubert Chathi	bb6cec27a5	rename get_devices_by_remote to get_device_updates_by_remote	2019-10-30 14:57:34 -04:00
Richard van der Hoff	0467f33584	fix delete_existing for _persist_events (#6300) ... this is part of _retry_on_integrity_error, so should only be on _persist_events_and_state_updates	2019-10-30 18:05:00 +00:00
Brendan Abolivier	dcc069a2e2	Lint	2019-10-30 18:01:56 +00:00
Brendan Abolivier	62588eae4a	Changelog	2019-10-30 17:54:40 +00:00