Commit Graph

14639 Commits (e5df12ad1668ba1d75e3d5fdf5fe1cb7d0a43400)

Author SHA1 Message Date
Brendan Abolivier e5df12ad16 Merge branch 'dinsic' into babolivier/dinsic-message-retention 2019-08-28 18:17:26 +01:00
Brendan Abolivier 70714595bc
Implement per-room message retention policies 2019-08-28 18:16:17 +01:00
Michael Kaye 62f5e3bc4c
Merge pull request #5812 from matrix-org/babolivier/account-validity-messages
Account validity: allow defining HTML templates to serve the user on account renewal attempt
2019-08-12 13:26:49 +01:00
Michael Kaye 63d0d21a28
Merge pull request #5781 from matrix-org/baboliver/loopingcall-args
Add ability to pass arguments to looping calls
2019-08-08 12:10:36 +01:00
Michael Kaye 8551b4f336
Merge pull request #5760 from matrix-org/babolivier/access-rules-public-restricted
Force the access rule to be "restricted" if the join rule is "public"
2019-08-08 12:10:22 +01:00
Brendan Abolivier 359aed4168 Lint 2019-08-01 16:08:39 +02:00
Brendan Abolivier cd47482257 Sample config 2019-08-01 16:08:39 +02:00
Brendan Abolivier a9567ee1a6 Changelog 2019-08-01 16:08:38 +02:00
Brendan Abolivier 9502bd8d78 Add tests 2019-08-01 16:08:38 +02:00
Brendan Abolivier 235271be4f Allow defining HTML templates to serve the user on account renewal 2019-08-01 16:08:38 +02:00
Brendan Abolivier 0c6500a08b
Explain rationale 2019-08-01 10:19:04 +02:00
Brendan Abolivier c862d5baf6
Check room ID and type of redacted event (#5784)
Check room ID and type of redacted event
2019-07-31 16:44:19 +02:00
Brendan Abolivier 35ec13baab
Ignore redactions of redactions in get_events_as_list 2019-07-31 15:48:57 +02:00
Brendan Abolivier c4e56a8ee9
Ignore invalid redactions in _get_event_from_row 2019-07-31 15:11:27 +02:00
Brendan Abolivier d2bb51080e
Incorporate review 2019-07-30 16:15:01 +02:00
Brendan Abolivier 0fda4e2e50
Should now work, unless we can't find the redaction event which happens for some reason (need to investigate) 2019-07-30 15:56:02 +02:00
Brendan Abolivier 8ced9a2f58
Don't make the checks depend on recheck_redaction 2019-07-30 15:55:18 +02:00
Brendan Abolivier bbd6208b3e
Do checks sooner 2019-07-29 17:22:42 +02:00
Brendan Abolivier 36c61df659
Check room ID and type of redacted event 2019-07-29 16:07:12 +02:00
Brendan Abolivier 132887db8c Changelog 2019-07-29 11:06:43 +02:00
Brendan Abolivier bec6d9e090 Add kwargs and doc 2019-07-29 11:06:43 +02:00
Brendan Abolivier 8a47155763 Add ability to pass arguments to looping calls 2019-07-29 11:06:43 +02:00
Brendan Abolivier ffa30b507f
Fix changelog 2019-07-25 10:19:13 +02:00
Brendan Abolivier 00b47fdfc7
Changelog 2019-07-25 10:17:07 +02:00
Brendan Abolivier 2526b79ce6
Merge ifs 2019-07-25 10:15:44 +02:00
Brendan Abolivier aea03c9d73
Doc 2019-07-25 10:14:41 +02:00
Brendan Abolivier ddf256c77f
Fix status code for forbidden events 2019-07-25 10:03:59 +02:00
Brendan Abolivier dd92685179
Only check the join rule on room creation if an access rule is also provided 2019-07-25 10:03:36 +02:00
Brendan Abolivier 0bb375c124
Turns out the default preset is public_chat 2019-07-24 17:29:17 +02:00
Brendan Abolivier ea5f86304e
Implement restrictions on new events 2019-07-24 17:27:07 +02:00
Brendan Abolivier d1a78ba2a3
Implement restriction on public room creation 2019-07-24 17:06:23 +02:00
Brendan Abolivier dcdfdb3f17
Add test case 2019-07-24 16:38:49 +02:00
Brendan Abolivier 4dc2eda1d3
Merge pull request #5702 from matrix-org/babolivier/3pid-invite
Fix check of the association between a 3PID invite and the subsequent m.room.member event in the 3rd party rules
2019-07-18 13:38:05 +02:00
Brendan Abolivier 13ad3f5ab1
Fix changelog 2019-07-17 15:10:16 +02:00
Brendan Abolivier 28803ad56a Merge branch 'dinsic' into babolivier/3pid-invite 2019-07-17 15:06:41 +02:00
Brendan Abolivier 446fb64d50
Changelog 2019-07-17 15:05:35 +02:00
Brendan Abolivier 34dd738e4b
There's no third_party_signed property in an invite's content 2019-07-17 15:03:23 +02:00
Brendan Abolivier 048f86ef5d
Fix check of the association between a 3PID invite and the subsequent m.room.member event in the 3rd party rules 2019-07-17 14:54:58 +02:00
Brendan Abolivier 3bc4ea841d
Merge pull request #5646 from matrix-org/babolivier/profile-allow-self
Port #5644 to dinsic
2019-07-09 13:19:57 +01:00
Amber H. Brown 4e954f4bbd make the base branch dinsic for dinsic 2019-07-09 20:53:38 +10:00
Amber H. Brown f10b6f7385 cut down circleci config to just what dinsic needs 2019-07-09 20:38:24 +10:00
Brendan Abolivier 9fc40f7b3f
Lint 2019-07-09 10:30:43 +01:00
Brendan Abolivier cf22aae355 Add test case 2019-07-09 10:27:53 +01:00
Brendan Abolivier 6b9d27d793 Changelog 2019-07-09 10:27:53 +01:00
Brendan Abolivier 25fff95448 Allow newly-registered users to lookup their own profiles
When a user creates an account and the 'require_auth_for_profile_requests' config flag is set, and a client that performed the registration wants to lookup the newly-created profile, the request will be denied because the user doesn't share a room with themselves yet.
2019-07-09 10:27:53 +01:00
Brendan Abolivier 5fe0cea37e
Merge pull request #5610 from matrix-org/babolivier/power-levels
Implement new restrictions on power levels
2019-07-04 11:12:47 +01:00
Brendan Abolivier 95b5d4ad54 Merge branch 'babolivier/power-levels' of github.com:matrix-org/synapse into babolivier/power-levels 2019-07-03 18:30:13 +01:00
Brendan Abolivier 4dd7de17b7
Incorporate review 2019-07-03 18:26:48 +01:00
Brendan Abolivier 8b44097771
Update synapse/third_party_rules/access_rules.py
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-07-03 18:21:42 +01:00
Brendan Abolivier 6b83a1826c
Incorporate review 2019-07-03 17:32:52 +01:00