12080 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Neil Johnson	ea068d6f3c	fix bug where preserved threepid user comes to sign up and server is mau blocked	2018-08-31 10:49:14 +01:00
Amber Brown	14e4d4f4bf	Port storage/ to Python 3 (#3725)	2018-08-31 00:19:58 +10:00
Richard van der Hoff	475253a88e	Merge pull request #3764 from matrix-org/rav/close_db_conn_after_init ... Make sure that we close db connections opened during init	2018-08-30 10:47:27 +01:00
Erik Johnston	7f0399586d	Merge pull request #3768 from krombel/fix_3445 ... fix #3445 - do not use itervalues() on SortedDict()	2018-08-29 16:29:57 +01:00
Krombel	8c0c51ecb3	changelog	2018-08-29 16:49:26 +02:00
Krombel	79a8a347a6	fix #3445 ... itervalues(d) calls d.itervalues() [PY2] and d.values() [PY3] but SortedDict only implements d.values()	2018-08-29 16:28:25 +02:00
Amber Brown	82276a18d1	Update CONTRIBUTING to clarify miscs & Markdown (#3730)	2018-08-29 19:06:59 +10:00
Matthew Hodgson	b1580f50fe	don't return non-LL-member state in incremental sync state blocks (#3760) ... don't return non-LL-member state in incremental sync state blocks	2018-08-28 23:25:58 +01:00
Richard van der Hoff	414fa36f3e	Fix up tests	2018-08-28 17:21:05 +01:00
Richard van der Hoff	32eb1dedd2	use abc.abstractproperty ... This gives clearer messages when someone gets it wrong	2018-08-28 17:10:43 +01:00
Richard van der Hoff	71990b3cae	changelog	2018-08-28 13:42:20 +01:00
Richard van der Hoff	0b07f02e19	Make sure that we close db connections opened during init ... We should explicitly close any db connections we open, because failing to do so can block other transactions as per https://github.com/matrix-org/synapse/issues/3682. Let's also try to factor out some of the boilerplate by having server classes define their datastore class rather than duplicating the whole of `setup`.	2018-08-28 13:39:49 +01:00
Erik Johnston	9fbaed325f	Merge pull request #3758 from matrix-org/erikj/admin_contact ... Change admin_uri to admin_contact in config and errors	2018-08-24 17:15:32 +01:00
Erik Johnston	9db2476991	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact	2018-08-24 17:00:37 +01:00
Erik Johnston	69f7f1418f	Newsfile	2018-08-24 16:54:06 +01:00
Erik Johnston	48b04c4a4c	Merge pull request #3756 from matrix-org/erikj/fix_tags_server_notices ... Fix checking if service notice room is already tagged	2018-08-24 16:53:11 +01:00
Erik Johnston	08abe8e13c	Newsfile	2018-08-24 16:52:52 +01:00
Erik Johnston	05077e06fa	Change admin_uri to admin_contact in config and errors	2018-08-24 16:51:27 +01:00
Erik Johnston	01a5a8b9e3	Fix checking if service notice room is already tagged ... This manifested in synapse repeatedly setting the tag for the room	2018-08-24 16:22:37 +01:00
Erik Johnston	897d976c1e	Merge pull request #3755 from matrix-org/erikj/fix_server_notice_tags ... Fix up tagging server notice rooms.	2018-08-24 15:04:41 +01:00
Erik Johnston	45fc0ead10	Newsfile	2018-08-24 15:04:29 +01:00
Erik Johnston	cdd24449ee	Ensure we wake up /sync when we add tag to notice room	2018-08-24 14:50:03 +01:00
Erik Johnston	14d49c51db	Make content of tag an empty object rather than null	2018-08-24 14:44:16 +01:00
Erik Johnston	84b4e76fed	Merge pull request #3754 from matrix-org/erikj/fix_whitelist ... Allow federation_domain_whitelist to be emtpy list	2018-08-24 12:23:39 +01:00
Erik Johnston	c780d84d66	Newsfile	2018-08-24 12:13:50 +01:00
Erik Johnston	1d67b13674	Fix bug when federation_domain_whitelist is an emtpy list ... Outbound federation were incorrectly allowed when the config option was set to an empty list	2018-08-24 12:13:12 +01:00
Erik Johnston	92d50e3c2a	Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticse ... Fix bug where we broke sync when using limit_usage_by_mau	2018-08-24 11:56:08 +01:00
Richard van der Hoff	e94cdbaecf	Merge pull request #3751 from matrix-org/rav/twisted_17 ... Pin to twisted 17.1 or later	2018-08-24 11:55:52 +01:00
Erik Johnston	9b1bc593c5	Newsfile	2018-08-24 11:36:39 +01:00
Erik Johnston	7f147d623b	Fix bug where we broke sync when using limit_usage_by_mau ... We assumed that we always had service notices configured, but that is not always true	2018-08-24 11:33:50 +01:00
Erik Johnston	15e8dd2ccc	Merge pull request #3749 from matrix-org/erikj/add_trial_users ... Implement trial users	2018-08-24 10:10:58 +01:00
Richard van der Hoff	05fe8a6c1c	changelog	2018-08-24 10:04:52 +01:00
Richard van der Hoff	f584d6108f	Pin to twisted 17.1 or later ... Fixes https://github.com/matrix-org/synapse/issues/3741.	2018-08-24 10:02:31 +01:00
Erik Johnston	28d7b546cb	Newsfile	2018-08-23 19:18:52 +01:00
Erik Johnston	f2cbbda956	Unit tests	2018-08-23 19:17:19 +01:00
Erik Johnston	cd77270a66	Implement trail users	2018-08-23 19:17:19 +01:00
Erik Johnston	242a0483eb	Merge pull request #3747 from matrix-org/erikj/fix_multiple_sends_notice ... Fix bug where we resent "limit exceeded" server notices	2018-08-23 18:10:08 +01:00
Erik Johnston	60cf1c6e16	Newsfile	2018-08-23 16:34:32 +01:00
Erik Johnston	7e6e588e60	Fix bug where we resent "limit exceeded" server notices ... This was due to a bug where we mutated a cached event's contents	2018-08-23 16:21:20 +01:00
Travis Ralston	1ca2744621	Merge pull request #3734 from matrix-org/travis/worker-docs ... Reference that the federation_reader needs the HTTP replication port set	2018-08-23 07:51:46 -06:00
Erik Johnston	dddb5aa7bb	Merge pull request #3746 from matrix-org/erikj/mau_fixups ... Fix MAU invalidation due to missing yield	2018-08-23 10:55:14 +01:00
Erik Johnston	4eb8408ed2	Newsfile	2018-08-23 10:46:13 +01:00
Erik Johnston	c5842dff1a	Actually run the tests	2018-08-23 10:35:54 +01:00
Erik Johnston	7a0da69eee	Add missing yield	2018-08-23 10:28:12 +01:00
Erik Johnston	a5806aba27	Merge pull request #3680 from matrix-org/neilj/server_notices_on_blocking ... server notices on resource limit blocking	2018-08-22 17:18:28 +01:00
Erik Johnston	fd2dbf1836	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking	2018-08-22 17:06:10 +01:00
Erik Johnston	9643a6f7f2	Update notice format	2018-08-22 17:00:29 +01:00
Erik Johnston	5c261107c9	Remove unnecessary resolve_events_with_state_map ... We only ever used the synchronous resolve_events_with_state_map in one place, which is trivial to replace with the async version.	2018-08-22 15:41:15 +01:00
Richard van der Hoff	c7181dcc6c	Merge branch 'master' into develop	2018-08-22 14:37:11 +01:00
Richard van der Hoff	74854a9719	Use recaptcha_ajax.js directly from Google ... This was originally done in commit c75b71a397, but got reverted on this branch due to the PR (#3677) being based on the wrong branch. We're ready to merge this to master now, so let's make it match release-v0.33.3.	2018-08-22 14:30:49 +01:00