13984 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brendan Abolivier	6fbf2ae9a8	Remove unused import	2019-05-20 19:49:19 +01:00
Brendan Abolivier	ed2b5b77f2	Config and changelog	2019-05-20 19:44:37 +01:00
Brendan Abolivier	6d54f1534a	First implementation of MSC2000	2019-05-20 19:42:39 +01:00
Brendan Abolivier	8f9ce1a8a2	Lint	2019-05-16 15:25:54 +01:00
Brendan Abolivier	cc8c139a39	Lint	2019-05-16 15:20:59 +01:00
Brendan Abolivier	a5fe16c5a7	Changelog + sample config	2019-05-16 15:11:37 +01:00
Brendan Abolivier	efdc55db75	Forgot copyright	2019-05-16 15:10:24 +01:00
Brendan Abolivier	54a582ed44	Add test case	2019-05-16 15:09:16 +01:00
Brendan Abolivier	cd32375846	Add option to disable per-room profiles	2019-05-16 14:34:28 +01:00
Matthew Hodgson	4a6d5de98c	Make /sync attempt to return device updates for both joined and invited users (#3484)	2019-05-16 13:23:43 +01:00
David Baker	fafb936de5	Merge pull request #5187 from matrix-org/dbkr/only_check_threepid_not_in_use_if_actually_registering ... Only check 3pids not in use when registering	2019-05-16 10:58:09 +01:00
David Baker	cd0faba7cd	Make newsfile clearer	2019-05-15 20:53:48 +01:00
Amber Brown	f1e5b41388	Make all the rate limiting options more consistent (#5181)	2019-05-15 12:06:04 -05:00
Richard van der Hoff	5f027a315f	Drop support for v2_alpha API prefix (#5190)	2019-05-15 17:37:46 +01:00
Richard van der Hoff	1757e2d7c3	Merge branch 'master' into develop	2019-05-15 14:09:30 +01:00
Richard van der Hoff	13018bb997	fix some typos in the changelog	2019-05-15 14:04:02 +01:00
Richard van der Hoff	4a926f528e	0.99.4	2019-05-15 13:58:45 +01:00
Erik Johnston	0aba6c8251	Merge pull request #5183 from matrix-org/erikj/async_serialize_event ... Allow client event serialization to be async	2019-05-15 10:36:30 +01:00
Erik Johnston	d94544051b	Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_array ... Expose DataStore._get_events as get_events_as_list	2019-05-15 10:17:38 +01:00
Erik Johnston	99c7dae087	Merge pull request #5185 from matrix-org/erikj/fix_config_ratelimiting ... Use correct config option for ratelimiting in tests	2019-05-15 09:54:15 +01:00
Erik Johnston	8ed2f182f7	Update docstring with correct return type ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-05-15 09:52:52 +01:00
Erik Johnston	52ddc6c0ed	Update docstring with correct type ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-05-15 09:52:15 +01:00
David Baker	efefb5bda2	Have I got newsfile for you	2019-05-14 19:18:42 +01:00
David Baker	6ca88c4693	Only check 3pids not in use when registering ... We checked that 3pids were not already in use before we checked if we were going to return the account previously registered in the same UI auth session, in which case the 3pids will definitely be in use. https://github.com/vector-im/riot-web/issues/9586	2019-05-14 19:04:59 +01:00
Richard van der Hoff	daa2fb6317	comment about user_joined_room	2019-05-14 18:53:09 +01:00
Erik Johnston	db3046f565	Newsfile	2019-05-14 14:39:27 +01:00
Erik Johnston	dc4f6d1b01	Use correct config option for ratelimiting in tests	2019-05-14 14:37:40 +01:00
Erik Johnston	53788a447f	Newsfile	2019-05-14 13:41:36 +01:00
Erik Johnston	4fb44fb5b9	Expose DataStore._get_events as get_events_as_list ... This is in preparation for reaction work which requires it.	2019-05-14 13:37:44 +01:00
Erik Johnston	a80e6b53f9	Newsfile	2019-05-14 13:12:23 +01:00
Erik Johnston	b54b03f9e1	Allow client event serialization to be async	2019-05-14 11:58:01 +01:00
Amber Brown	df2ebd75d3	Migrate all tests to use the dict-based config format instead of hanging items off HomeserverConfig (#5171)	2019-05-13 15:01:14 -05:00
Andrew Morgan	5a4b328f52	Add ability to blacklist ip ranges for federation traffic (#5043)	2019-05-13 19:05:06 +01:00
Brendan Abolivier	2e1129b5f7	0.99.4rc1	2019-05-13 16:11:21 +01:00
Brendan Abolivier	8cc9ba3522	Merge pull request #5179 from matrix-org/babolivier/isort ... Fix CI after new release of isort	2019-05-13 15:48:29 +01:00
Brendan Abolivier	2725cd2290	Fix changelog	2019-05-13 15:32:07 +01:00
Brendan Abolivier	1a536699fd	Changelog	2019-05-13 15:21:23 +01:00
Brendan Abolivier	bb93757b32	Fix CI after new release of isort	2019-05-13 15:19:44 +01:00
Richard van der Hoff	9a18e1d832	Merge branch 'master' into develop	2019-05-10 23:01:41 +01:00
Andrew Morgan	2f48c4e1ae	URL preview blacklisting fixes (#5155) ... Prevents a SynapseError being raised inside of a IResolutionReceiver and instead opts to just return 0 results. This thus means that we have to lump a failed lookup and a blacklisted lookup together with the same error message, but the substitute should be generic enough to cover both cases.	2019-05-10 10:32:44 -07:00
David Baker	c2bb7476c9	Revert 085ae346ac ... Accidentally went straight to develop	2019-05-10 11:08:01 +01:00
David Baker	085ae346ac	Add a DUMMY stage to captcha-only registration flow ... This allows the client to complete the email last which is more natual for the user. Without this stage, if the client would complete the recaptcha (and terms, if enabled) stages and then the registration request would complete because you've now completed a flow, even if you were intending to complete the flow that's the same except has email auth at the end. Adding a dummy auth stage to the recaptcha-only flow means it's always unambiguous which flow the client was trying to complete. Longer term we should think about changing the protocol so the client explicitly says which flow it's trying to complete. https://github.com/vector-im/riot-web/issues/9586	2019-05-10 10:52:24 +01:00
Richard van der Hoff	a78996cc4a	fix sample config	2019-05-10 09:46:28 +01:00
Gergely Polonkai	cd3f30014a	Make Prometheus snippet less confusing on the metrics collection doc (#4288) ... Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>	2019-05-10 09:15:08 +01:00
Christoph Müller	ee90c06e38	Set syslog identifiers in systemd units (#5023)	2019-05-10 09:09:25 +01:00
Amber Brown	b36c82576e	Run Black on the tests again (#5170)	2019-05-10 00:12:11 -05:00
colonelkrud	d9a02d1201	Add AllowEncodedSlashes to apache (#5068) ... * Add AllowEncodedSlashes to apache Add `AllowEncodedSlashes On` to apache config to support encoding for v3 rooms. "The AllowEncodedSlashes setting is not inherited by virtual hosts, and virtual hosts are used in many default Apache configurations, such as the one in Ubuntu. The workaround is to add the AllowEncodedSlashes setting inside a <VirtualHost> container (/etc/apache2/sites-available/default in Ubuntu)." Source: https://stackoverflow.com/questions/4390436/need-to-allow-encoded-slashes-on-apache * change allowencodedslashes to nodecode	2019-05-09 23:27:04 +01:00
Richard van der Hoff	ea41c740ee	Merge remote-tracking branch 'origin/master' into develop	2019-05-09 22:54:04 +01:00
Richard van der Hoff	84cebb89cc	remove instructions for jessie installation (#5164) ... We don't ship jessie packages, so these were a bit misleading.	2019-05-09 22:53:46 +01:00
Richard van der Hoff	130f932cbc	Run black on per_destination_queue ... ... mostly to fix pep8 fails	2019-05-09 16:27:02 +01:00