2135 commits

Author	SHA1	Message	Date
Brendan Abolivier	f5d8fdf0a7	Update changelog	2019-11-05 14:44:25 +00:00
Brendan Abolivier	e252ffadbc	Merge branch 'develop' into babolivier/msc2326_bg_update	2019-11-04 18:09: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
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	416c7baee6	Changelog	2019-11-04 09:56:10 +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
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
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
Neil Pilgrim	befd58f47b	Document lint.sh & allow application to specified files only (#6312)	2019-11-01 10:52:20 +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	1f156398b9	add changelog	2019-10-31 23:02:20 -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
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	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	b2ff8c305f	Newsfile	2019-10-31 11:32:53 +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	670972c0e1	Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify	2019-10-30 16:46:31 -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	62588eae4a	Changelog	2019-10-30 17:54:40 +00:00
Erik Johnston	d3f694d628	Newsfile	2019-10-30 14:53:09 +00:00
Hubert Chathi	7d7eac61be	Merge branch 'develop' into cross-signing_federation	2019-10-30 10:17:10 -04:00
Erik Johnston	ec6de1cc7d	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_persistence_store	2019-10-30 13:37:04 +00:00
Erik Johnston	e5c3a99091	Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptor ... Make ObservableDeferred.observe() always return deferred.	2019-10-30 14:06:34 +01:00
Yash Jipkate	9677613e9c	Modify doc to update Google ReCaptcha terms (#6257)	2019-10-30 12:30:20 +00:00
Andrew Morgan	7e17959984	Update email section of INSTALL.md about account_threepid_delegates (#6272)	2019-10-30 11:37:56 +00:00
Erik Johnston	1de28183cb	Newsfile	2019-10-30 11:37:56 +00:00
Andrew Morgan	a2276d4d3c	Fix log line that was printing undefined value (#6278)	2019-10-30 11:28:48 +00:00
Andrew Morgan	2cab02f9d1	Update CI to run isort on scripts and scripts-dev (#6270)	2019-10-30 11:17:14 +00:00
Andrew Morgan	7955abeaac	Fix small typo in comment (#6269)	2019-10-30 11:16:19 +00:00
Andrew Morgan	46c12918ad	Fix typo in domain name in account_threepid_delegates config option (#6273)	2019-10-30 11:07:42 +00:00
Andrew Morgan	9178ac1b6a	Remove redundant arguments to CI's flake8 (#6277)	2019-10-30 11:07:18 +00:00
Andrew Morgan	b39ca49db1	Handle FileNotFound error in checking git repository version (#6284)	2019-10-30 11:00:15 +00:00
Erik Johnston	770d1ef673	Merge pull request #6280 from matrix-org/erikj/receipts_async_await ... Port receipt and read markers to async/wait	2019-10-30 11:44:18 +01:00
Erik Johnston	ba4cc5541c	Merge pull request #6274 from matrix-org/erikj/replication_async ... Port replication http server endpoints to async/await	2019-10-30 11:44:08 +01:00
Erik Johnston	72bc6294ed	Merge pull request #6275 from matrix-org/erikj/port_rest_events ... Port room rest handlers to async/await	2019-10-30 11:44:02 +01:00
Erik Johnston	38474707b9	Merge branch 'erikj/federation_server_async_await' of github.com:matrix-org/synapse into erikj/receipts_async_await	2019-10-29 15:53:17 +00:00
Erik Johnston	74c1e16106	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/federation_server_async_await	2019-10-29 15:52:39 +00:00
Erik Johnston	307e313ef4	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/port_rest_events	2019-10-29 15:51:12 +00:00
Erik Johnston	d6e40e7cbd	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replication_async	2019-10-29 15:42:58 +00:00
Brendan Abolivier	d79151921a	Fix CI for synapse_port_db (#6276) ... * 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	2019-10-29 15:39:44 +00:00