46345187cc
Merge pull request #3243 from NotAFile/py3-six-3
...
Replace some more comparisons with six
2018-05-24 16:08:57 +01:00
037c6db85d
Merge branch 'master' into develop
2018-05-24 16:03:44 +01:00
14ca678674
Update CHANGES.rst
2018-05-24 15:54:02 +01:00
6f67163c63
Update CHANGES.rst
2018-05-24 15:04:41 +01:00
bdd2ed5acf
update for v0.30.0
2018-05-24 15:02:03 +01:00
f72d5a44d5
Merge pull request #3261 from matrix-org/erikj/pagination_fixes
...
Fix federation backfill bugs
2018-05-24 14:52:03 +01:00
68399fc4de
Merge pull request #3267 from matrix-org/erikj/iter_filter
...
Use iter* methods for _filter_events_for_server
2018-05-24 14:44:57 +01:00
91d95a1d8e
bump version
2018-05-24 14:05:07 +01:00
8c98281b8d
Merge branch 'release-v0.30.0' into develop
2018-05-24 10:33:12 +01:00
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
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
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
043f05a078
Merge docs on consent bits from PR #3268 into release branch
2018-05-23 16:24:58 +01:00
96f07cebda
Merge pull request #3268 from matrix-org/rav/privacy_policy_docs
...
Docs on consent bits
2018-05-23 16:23:05 +01:00
a0b3946fe2
Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri
2018-05-23 16:06:03 +01:00
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
e206b2c9ac
consent_tracking.md: clarify link
2018-05-23 15:57:10 +01:00
2df8c3139a
minor post-review tweaks
2018-05-23 15:39:52 +01:00
dda40fb55d
fix typo
2018-05-23 15:30:26 +01:00
3ff6f50eac
Use the localpart in the consent uri
...
... because it's shorter.
2018-05-23 15:28:23 +01:00
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
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
cd8ab9a0d8
mention public_baseurl
2018-05-23 14:43:09 +01:00
321f02d263
Block attempts to send server notices to remote users
2018-05-23 14:30:47 +01:00
1cbb8e5a33
fix wrapping
2018-05-23 13:58:28 +01:00
052d08a6a5
Using the manhole to send server notices
2018-05-23 13:55:39 +01:00
5ad1149f38
Notes on the manhole
2018-05-23 13:47:34 +01:00
563606b8f2
consent_tracking: formatting etc
2018-05-23 12:37:39 +01:00
2574ea3dc8
server_notices.md: fix link
2018-05-23 12:34:34 +01:00
833db2d922
consent tracking docs
2018-05-23 12:32:38 +01:00
9e8ab0a4f4
style
2018-05-23 12:05:58 +01:00
3601a240aa
bump version and changelog
2018-05-23 12:03:23 +01:00
e7598b666b
Some docs about server notices
2018-05-23 11:14:23 +01:00
5aaa3189d5
s/values/itervalues/
2018-05-23 10:13:05 +01:00
0a4bca4134
Use iter* methods for _filter_events_for_server
2018-05-23 10:04:23 +01:00
e85b5a0ff7
Use iter* methods
2018-05-22 19:02:48 +01:00
586b66b197
Fix that states is a dict of dicts
2018-05-22 19:02:36 +01:00
35ca3e7b65
Merge pull request #3265 from matrix-org/erikj/limit_pagination
...
Don't support limitless pagination
2018-05-22 18:29:36 +01:00
a17e901f4d
Remove unused string formatting param
2018-05-22 18:24:32 +01:00
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
ad2823ee27
fix synchrotron
2018-05-22 17:47:42 +01:00
08bfc48abf
custom error code for not leaving server notices room
2018-05-22 17:27:27 +01:00
0a078026ea
comment typo
2018-05-22 17:14:06 +01:00
cb2a2ad791
get_domains_from_state returns list of tuples
2018-05-22 16:23:39 +01:00
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
82c2a52987
Merge pull request #3263 from matrix-org/rav/fix_jinja_dep
...
Fix dependency on jinja2
2018-05-22 15:31:08 +01:00
7b36d06a69
Add a 'has_consented' template var to consent forms
...
fixes #3260
2018-05-22 14:58:34 +01:00
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
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
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
Erik Johnston