9829 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Richard van der Hoff	21bf87a146	Reinstate media download on thumbnail request ... We need to actually download the remote media when we get a request for a thumbnail.	2018-01-12 15:38:06 +00:00
Erik Johnston	fefeb0ab0e	Merge pull request #2774 from matrix-org/erikj/synctl ... When using synctl with workers, don't start the main synapse automatically	2018-01-12 12:00:07 +00:00
Erik Johnston	f4d93ae424	Actually make it work	2018-01-12 10:39:27 +00:00
Erik Johnston	f68e4cf690	Refactor	2018-01-12 10:11:12 +00:00
Richard van der Hoff	5f23b6d5ea	Merge pull request #2766 from matrix-org/rav/room_event ... Add /room/{id}/event/{id} to synapse	2018-01-11 14:47:18 +00:00
Erik Johnston	7cd34512d8	When using synctl with workers, don't start the main synapse automatically	2018-01-11 11:37:39 +00:00
Erik Johnston	07ab948c38	Merge branch 'master' of github.com:matrix-org/synapse into develop	2018-01-11 11:23:40 +00:00
Erik Johnston	825a07a974	Merge pull request #2773 from matrix-org/erikj/hash_bg ... Do bcrypt hashing in a background thread	2018-01-10 18:11:41 +00:00
Erik Johnston	f8e1ab5fee	Do bcrypt hashing in a background thread	2018-01-10 18:01:28 +00:00
Erik Johnston	b9e4a97922	Merge pull request #2772 from matrix-org/t3chguy/patch-1 ... Fix publicised groups GET API (singular) over federation	2018-01-10 15:15:48 +00:00
Michael Telatynski	5f07f5694c	fix order of operations derp and also use .get to default to {} ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-10 15:11:35 +00:00
Michael Telatynski	8c9d5b4873	Fix publicised groups API (singular) over federation ... which was missing its fed client API, since there is no other API it might as well reuse the bulk one and unwrap it Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-10 15:04:51 +00:00
Richard van der Hoff	c175a5f0f2	Merge pull request #2770 from matrix-org/rav/fix_request_metrics ... Update http request metrics before calling servlet	2018-01-10 14:53:40 +00:00
Richard van der Hoff	d90e8ea444	Update http request metrics before calling servlet ... Make sure that we set the servlet name in the metrics object *before* calling the servlet, in case the servlet throws an exception.	2018-01-09 18:27:35 +00:00
Erik Johnston	ce3a726fc0	Merge pull request #2764 from matrix-org/erikj/remove_dead_thumbnail_code ... Remove dead code related to default thumbnails	2018-01-09 16:01:02 +00:00
Erik Johnston	b6c9deffda	Remove dead TODO	2018-01-09 15:53:23 +00:00
Richard van der Hoff	51c9d9ed65	Add /room/{id}/event/{id} to synapse ... Turns out that there is a valid usecase for retrieving event by id (notably having received a push), but event ids should be scoped to room, so /event/{id} is wrong.	2018-01-09 14:39:12 +00:00
Erik Johnston	b30cd5b107	Remove dead code related to default thumbnails	2018-01-09 14:38:33 +00:00
Richard van der Hoff	a767f06e3f	Merge pull request #2765 from matrix-org/rav/fix_room_uts ... Fix flaky test_rooms UTs	2018-01-09 14:21:03 +00:00
Richard van der Hoff	cb66a2d387	Merge pull request #2763 from matrix-org/rav/fix_config_uts ... Fix broken config UTs	2018-01-09 12:08:08 +00:00
Richard van der Hoff	aed4e4ecdd	Merge pull request #2762 from matrix-org/rav/fix_logconfig_indenting ... Make indentation of generated log config consistent	2018-01-09 12:07:56 +00:00
Richard van der Hoff	f8fa5ae4af	enable twisted delayedcall debugging in UTs	2018-01-09 12:06:45 +00:00
Richard van der Hoff	374c4d4ced	Remove dead code ... pointless function is pointless	2018-01-09 12:06:45 +00:00
Richard van der Hoff	142fb0a7d4	Disable user_directory updates for UTs ... Fix flakiness in the UTs caused by the user_directory being updated in the background	2018-01-09 12:06:45 +00:00
Richard van der Hoff	0211464ba2	Fix broken config UTs ... https://github.com/matrix-org/synapse/pull/2755 broke log-config generation, which in turn broke the unit tests.	2018-01-09 11:28:33 +00:00
Richard van der Hoff	3a556f1ea0	Make indentation of generated log config consistent ... (we had a mix of 2- and 4-space indents)	2018-01-09 11:27:19 +00:00
Erik Johnston	e9f7677170	Merge pull request #2761 from turt2live/patch-1 ... Fix templating error with unban permission message	2018-01-08 10:10:49 +00:00
Travis Ralston	eccfc8e928	Fix templating error with unban permission message ... Fixes https://github.com/matrix-org/synapse/issues/2759 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-01-07 19:52:58 -07:00
Richard van der Hoff	e6b24663e4	Merge pull request #2755 from matrix-org/richvdh-patch-1 ... Remove 'verbosity'/'log_file' from generated cfg	2018-01-05 14:17:46 +00:00
Richard van der Hoff	840f72356e	Remove 'verbosity'/'log_file' from generated cfg ... ... because these only really exist to confuse people nowadays. Also bring log config more into line with the generated log config, by making `level_for_storage` apply to the `synapse.storage.SQL` logger rather than `synapse.storage`.	2018-01-05 12:30:28 +00:00
Erik Johnston	18e3a16e8b	Merge branch 'release-v0.26.0' of github.com:matrix-org/synapse	2018-01-05 10:54:22 +00:00
Erik Johnston	864a6d2977	Bump version and changelog	2018-01-05 10:54:01 +00:00
Richard van der Hoff	6e375f4597	Merge pull request #2744 from matrix-org/rav/login_logging ... Better logging when login can't find a 3pid	2018-01-05 09:54:39 +00:00
Richard van der Hoff	efdfd5c835	Merge pull request #2745 from matrix-org/rav/assert_params ... Check missing fields in event_from_pdu_json	2018-01-05 09:52:39 +00:00
Richard van der Hoff	bd91857028	Check missing fields in event_from_pdu_json ... Return a 400 rather than a 500 when somebody messes up their send_join	2017-12-30 18:40:19 +00:00
Richard van der Hoff	3079f80d4a	Factor out event_from_pdu_json ... turns out we have two copies of this, and neither needs to be an instance method	2017-12-30 18:40:19 +00:00
Richard van der Hoff	65abc90fb6	federation_server: clean up imports	2017-12-30 18:40:19 +00:00
Richard van der Hoff	a7b726ad18	federation_client: clean up imports	2017-12-30 18:40:19 +00:00
Richard van der Hoff	75c1b8df01	Better logging when login can't find a 3pid	2017-12-20 19:31:00 +00:00
Richard van der Hoff	3f9f1c50f3	Merge pull request #2683 from seckrv/fix_pwd_auth_prov_typo ... synapse/config/password_auth_providers: Fixed bracket typo	2017-12-18 22:37:21 +00:00
Richard van der Hoff	48fa4e1e5b	Merge pull request #2435 from silkeh/listen-ipv6-default ... Adapt the default config to bind on both IPv4 and IPv6 on all platforms	2017-12-18 22:34:50 +00:00
Silke	df0f602796	Implement listen_tcp method in remaining workers ... Signed-off-by: Silke <silke@slxh.eu>	2017-12-18 20:00:42 +01:00
Silke	26cd3f5690	Remove logger argument and do not catch replication listener ... Signed-off-by: Silke <silke@slxh.eu>	2017-12-18 20:00:42 +01:00
Matthew Hodgson	3355ce650d	Merge pull request #2737 from Valodim/master ... mention federation tester more prominently in the readme	2017-12-17 23:05:17 +00:00
Silke Hofstra	ed48ecc58c	Add methods for listening on multiple addresses ... Add listen_tcp and listen_ssl which implement Twisted's reactor.listenTCP and reactor.listenSSL for multiple addresses. Signed-off-by: Silke Hofstra <silke@slxh.eu>	2017-12-17 13:15:48 +01:00
Silke Hofstra	37d1a90025	Allow binds to both :: and 0.0.0.0 ... Binding on 0.0.0.0 when :: is specified in the bind_addresses is now allowed. This causes a warning explaining the behaviour. Configuration changed to match. See #2232 Signed-off-by: Silke Hofstra <silke@slxh.eu>	2017-12-17 13:10:31 +01:00
Willem Mulder	3e59143ba8	Adapt the default config to bind on IPv6. ... Most deployments are on Linux (or Mac OS), so this would actually bind on both IPv4 and IPv6. Resolves #1886. Signed-off-by: Willem Mulder <willemmaster@hotmail.com>	2017-12-17 13:07:37 +01:00
Vincent Breitmoser	9419bb5776	mention federation tester more prominently in the readme	2017-12-16 22:09:53 +02:00
Erik Johnston	80573e3900	Fix rc version number	2017-12-13 15:15:33 +00:00
Erik Johnston	069ae2a5d6	Bump changelog and version	2017-12-13 15:11:22 +00:00