10873 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Richard van der Hoff	757ed27258	Let users leave the server notice room after joining ... They still can't reject invites, but we let them leave it.	2018-05-25 11:07:21 +01:00
Richard van der Hoff	8c98281b8d	Merge branch 'release-v0.30.0' into develop	2018-05-24 10:33:12 +01:00
Richard van der Hoff	6abcb5d22d	Merge pull request #3273 from matrix-org/rav/server_notices_avatar_url ... Allow overriding the server_notices user's avatar	2018-05-24 10:31:43 +01:00
Richard van der Hoff	9bf4b2bda3	Allow overriding the server_notices user's avatar ... probably should have done this in the first place, like @turt2live suggested.	2018-05-23 17:43:30 +01:00
Richard van der Hoff	23aa70cea8	Merge pull request #3272 from matrix-org/rav/localpart_in_consent_uri ... Use the localpart in the consent uri	2018-05-23 16:29:44 +01:00
Richard van der Hoff	043f05a078	Merge docs on consent bits from PR #3268 into release branch	2018-05-23 16:24:58 +01:00
Richard van der Hoff	96f07cebda	Merge pull request #3268 from matrix-org/rav/privacy_policy_docs ... Docs on consent bits	2018-05-23 16:23:05 +01:00
Richard van der Hoff	a0b3946fe2	Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri	2018-05-23 16:06:03 +01:00
Richard van der Hoff	2f7008d4eb	Merge pull request #3271 from matrix-org/rav/consent_uri_in_messages ... Support for putting %(consent_uri)s in messages	2018-05-23 16:04:30 +01:00
Richard van der Hoff	e206b2c9ac	consent_tracking.md: clarify link	2018-05-23 15:57:10 +01:00
Richard van der Hoff	2df8c3139a	minor post-review tweaks	2018-05-23 15:39:52 +01:00
Richard van der Hoff	dda40fb55d	fix typo	2018-05-23 15:30:26 +01:00
Richard van der Hoff	3ff6f50eac	Use the localpart in the consent uri ... ... because it's shorter.	2018-05-23 15:28:23 +01:00
Richard van der Hoff	82191b08f6	Support for putting %(consent_uri)s in messages ... Make it possible to put the URI in the error message and the server notice that get sent by the server	2018-05-23 15:24:31 +01:00
Richard van der Hoff	2c62ea2515	Merge pull request #3270 from matrix-org/rav/block_remote_server_notices ... Block attempts to send server notices to remote users	2018-05-23 15:06:35 +01:00
Richard van der Hoff	cd8ab9a0d8	mention public_baseurl	2018-05-23 14:43:09 +01:00
Richard van der Hoff	321f02d263	Block attempts to send server notices to remote users	2018-05-23 14:30:47 +01:00
Richard van der Hoff	1cbb8e5a33	fix wrapping	2018-05-23 13:58:28 +01:00
Richard van der Hoff	052d08a6a5	Using the manhole to send server notices	2018-05-23 13:55:39 +01:00
Richard van der Hoff	5ad1149f38	Notes on the manhole	2018-05-23 13:47:34 +01:00
Richard van der Hoff	563606b8f2	consent_tracking: formatting etc	2018-05-23 12:37:39 +01:00
Richard van der Hoff	2574ea3dc8	server_notices.md: fix link	2018-05-23 12:34:34 +01:00
Richard van der Hoff	833db2d922	consent tracking docs	2018-05-23 12:32:38 +01:00
Neil Johnson	9e8ab0a4f4	style	2018-05-23 12:05:58 +01:00
Neil Johnson	3601a240aa	bump version and changelog	2018-05-23 12:03:23 +01:00
Richard van der Hoff	e7598b666b	Some docs about server notices	2018-05-23 11:14:23 +01:00
Erik Johnston	35ca3e7b65	Merge pull request #3265 from matrix-org/erikj/limit_pagination ... Don't support limitless pagination	2018-05-22 18:29:36 +01:00
Erik Johnston	a17e901f4d	Remove unused string formatting param	2018-05-22 18:24:32 +01:00
Erik Johnston	5494c1d71e	Don't support limitless pagination ... The pagination storage function supported not specifiying a limit on the number of events returned. This was triggered when using the search or context API with a limit of zero, which the storage function took to mean not being limited.	2018-05-22 18:15:21 +01:00
hera	ad2823ee27	fix synchrotron	2018-05-22 17:47:42 +01:00
Richard van der Hoff	08bfc48abf	custom error code for not leaving server notices room	2018-05-22 17:27:27 +01:00
David Baker	0a078026ea	comment typo	2018-05-22 17:14:06 +01:00
Richard van der Hoff	08a14b32ae	Merge pull request #3262 from matrix-org/rav/has_already_consented ... Add a 'has_consented' template var to consent forms	2018-05-22 15:35:10 +01:00
Richard van der Hoff	82c2a52987	Merge pull request #3263 from matrix-org/rav/fix_jinja_dep ... Fix dependency on jinja2	2018-05-22 15:31:08 +01:00
Richard van der Hoff	7b36d06a69	Add a 'has_consented' template var to consent forms ... fixes #3260	2018-05-22 14:58:34 +01:00
Richard van der Hoff	669400e22f	Enable auto-escaping for the consent templates ... ... to reduce the risk of somebody introducing an html injection attack...	2018-05-22 14:58:34 +01:00
Richard van der Hoff	b5b2d5d64b	Fix dependency on jinja2 ... Delay the import of ConsentResource, so that we can get away without jinja2 if people don't have the consent resource enabled. Fixes #3259	2018-05-22 14:03:45 +01:00
Richard van der Hoff	3b2def6c7a	Merge pull request #3257 from matrix-org/rav/fonx_on_no_consent ... Reject attempts to send event before privacy consent is given	2018-05-22 12:01:43 +01:00
Richard van der Hoff	a5e2941aad	Reject attempts to send event before privacy consent is given ... Returns an M_CONSENT_NOT_GIVEN error (cf https://github.com/matrix-org/matrix-doc/issues/1252) if consent is not yet given.	2018-05-22 12:00:47 +01:00
Richard van der Hoff	8aeb529262	Merge pull request #3236 from matrix-org/rav/consent_notice ... Send users a server notice about consent	2018-05-22 11:56:09 +01:00
Richard van der Hoff	8810685df9	Stub out ServerNoticesSender on the workers ... ... and have the sync endpoints call it directly rather than obsure indirection via PresenceHandler	2018-05-22 11:54:51 +01:00
Richard van der Hoff	d5dca9a04f	Move consent config parsing into ConsentConfig ... turns out we need to reuse this, so it's better in the config class.	2018-05-22 11:54:51 +01:00
Richard van der Hoff	9ea219c514	Send users a server notice about consent ... When a user first syncs, we will send them a server notice asking them to consent to the privacy policy if they have not already done so.	2018-05-22 11:54:51 +01:00
Richard van der Hoff	d14d7b8fdc	Rename 'version' param on user consent config ... we're going to use it for the version we require too.	2018-05-22 11:54:51 +01:00
Erik Johnston	7cfa8a87a1	Merge pull request #3258 from matrix-org/erikj/fixup_logcontext_rusage ... Fix logcontext resource usage tracking	2018-05-22 11:39:56 +01:00
Erik Johnston	7948ecf234	Comment	2018-05-22 11:39:43 +01:00
Erik Johnston	020377a550	Fix logcontext resource usage tracking	2018-05-22 11:16:07 +01:00
Erik Johnston	13a8dfba0d	Merge pull request #3252 from matrix-org/erikj/in_flight_requests ... Add in flight request metrics	2018-05-22 09:54:30 +01:00
Erik Johnston	c435b0b441	Don't store context	2018-05-22 09:34:26 +01:00
Erik Johnston	fb2806b186	Move in_flight_requests_count to be a callback metric	2018-05-22 09:31:53 +01:00