Andrew Morgan
2f450fa149
Implement access token expiry ( #5660 )
2020-02-17 17:17:02 +00:00
Andrew Morgan
d246c99947
Merge pull request #5638 from matrix-org/babolivier/invite-json
2020-02-17 16:35:24 +00:00
Andrew Morgan
748ebe2fd5
Include the original event in /relations ( #5626 )
2020-02-17 13:53:53 +00:00
Andrew Morgan
4eb0bbad04
Add origin_server_ts and sender fields to m.replace ( #5613 )
2020-02-17 13:21:58 +00:00
Andrew Morgan
41120db159
Move logging utilities out of the side drawer of util/ and into logging/ ( #5606 )
2020-02-14 11:02:55 +00:00
Andrew Morgan
3c29cee8e9
Fix media repo breaking ( #5593 )
2020-02-14 10:59:44 +00:00
Andrew Morgan
65787fe811
Make the http server handle coroutine-making REST servlets ( #5475 )
2020-02-14 10:57:48 +00:00
Andrew Morgan
28eba8747e
Run Black. ( #5482 )
2020-02-13 11:30:15 +00:00
Andrew Morgan
0295abdcf7
Dinsic Blacking with black==18.6b2
2020-02-11 16:18:29 +00:00
Andrew Morgan
d49933470d
Add limit_profile_requests_to_known_users option ( #18 )
2019-12-05 11:55:12 +00:00
Andrew Morgan
c446f59047
Hide expired users from user directory, optionally show on renewal ( #13 )
2019-11-14 18:42:55 +00:00
Andrew Morgan
d6b7606e07
Create configurable ratelimiter for 3pid invites ( #11 )
2019-11-12 11:38:35 +00:00
Brendan Abolivier
dfa60504af
Don't apply retention policy based filtering on state events
...
As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy.
2019-11-06 15:47:40 +00:00
Brendan Abolivier
c49ba3677c
Fixup tests
2019-10-04 12:21:33 +01:00
Brendan Abolivier
ce2448efbe
Fix git messing up
2019-09-27 17:18:10 +01:00
Brendan Abolivier
97672c03e2
ok
2019-09-27 16:57:19 +01:00
Brendan Abolivier
acf6b2388e
Lint
2019-09-27 16:57:19 +01:00
Brendan Abolivier
27b982269e
Merge pull request #2 from matrix-org/babolivier/dinsic-3pid-invite
...
Don't treat 3PID revocation as a new 3PID invite
2019-09-10 11:32:31 +01:00
Brendan Abolivier
76f70779f1
Revert "Merge pull request #5932 from matrix-org/babolivier/account_validity_template_encode"
...
This reverts commit 84e695f50699eec6d2d5
2019-09-09 16:36:00 +01:00
Brendan Abolivier
6a78a0ce9b
Lint
2019-09-06 15:51:52 +01:00
Brendan Abolivier
e35c30ed4b
Fix bogus conflict resolution
2019-09-06 15:44:48 +01:00
Brendan Abolivier
e163df4c20
Merge branch 'dinsic' into babolivier/dinsic-3pid-invite
2019-09-06 15:41:37 +01:00
Brendan Abolivier
b2ec4467c9
Don't process revoked/redacted events as part of the room's membership info
2019-09-06 15:36:43 +01:00
Brendan Abolivier
b15557cd46
Don't treat 3PID revokation as a new 3PID invite
2019-09-06 15:32:11 +01:00
Brendan Abolivier
2477f1f7aa
Add tests
2019-09-05 16:25:37 +01:00
Brendan Abolivier
7a95d8fff9
Fix encoding for account validity HTML files on Python 2
2019-08-29 16:03:59 +01:00
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
Brendan Abolivier
9502bd8d78
Add tests
2019-08-01 16:08:38 +02:00
Brendan Abolivier
ddf256c77f
Fix status code for forbidden events
2019-07-25 10:03:59 +02:00
Brendan Abolivier
0bb375c124
Turns out the default preset is public_chat
2019-07-24 17:29:17 +02:00
Brendan Abolivier
dcdfdb3f17
Add test case
2019-07-24 16:38:49 +02:00
Richard van der Hoff
5f158ec039
Implement access token expiry ( #5660 )
...
Record how long an access token is valid for, and raise a soft-logout once it
expires.
2019-07-12 17:26:02 +01:00
Andrew Morgan
d88421ab03
Include the original event in /relations ( #5626 )
...
When asking for the relations of an event, include the original event in the response. This will mostly be used for efficiently showing edit history, but could be useful in other circumstances.
2019-07-09 13:43:08 +01: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
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
73cb716b3c
Lint
2019-07-08 17:44:20 +01:00
Brendan Abolivier
5e01e9ac19
Add test case
2019-07-08 17:41:16 +01:00
Andrew Morgan
ad8b909ce9
Add origin_server_ts and sender fields to m.replace ( #5613 )
...
Riot team would like some extra fields as part of m.replace, so here you go.
Fixes : #5598
2019-07-05 17:20:02 +01:00
Brendan Abolivier
8d28817eac
Add tests
2019-07-03 15:43:52 +01:00
Amber Brown
463b072b12
Move logging utilities out of the side drawer of util/ and into logging/ ( #5606 )
2019-07-04 00:07:04 +10:00
Amber Brown
0ee9076ffe
Fix media repo breaking ( #5593 )
2019-07-02 19:01:28 +01:00
Amber Brown
f40a7dc41f
Make the http server handle coroutine-making REST servlets ( #5475 )
2019-06-29 17:06:55 +10:00
Brendan Abolivier
84875301b6
Split public rooms directory auth config in two
2019-06-24 16:41:48 +01:00
Brendan Abolivier
bfe84e051e
Split public rooms directory auth config in two
2019-06-24 15:42:31 +01:00
Amber Brown
32e7c9e7f2
Run Black. ( #5482 )
2019-06-20 19:32:02 +10:00
Brendan Abolivier
c1bc48f9d4
Add tests for constraints on changing the rule for a room
2019-06-18 18:07:05 +01:00
Brendan Abolivier
9b3c69f661
Add tests for 3PID invites
2019-06-18 17:59:07 +01:00
