Andrew Morgan
0ed71e4e4b
Merge pull request #5458 from matrix-org/hawkowl/fix-prometheus
2020-02-10 14:48:37 +00:00
Andrew Morgan
9efcd2da53
Expose statistics on extrems to prometheus ( #5384 )
2020-02-10 14:42:57 +00: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
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
8d28817eac
Add tests
2019-07-03 15:43:52 +01:00
Brendan Abolivier
ee0ee97447
Add test case for #5574
...
There's no test that makes sure #5574 didn't break things or works correctly (my bad), so this PR adds a test case that makes sure of it.
2019-06-28 10:29:02 +01:00
Brendan Abolivier
84875301b6
Split public rooms directory auth config in two
2019-06-24 16:41:48 +01: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
Brendan Abolivier
1532369dcd
Remove unused import
2019-06-18 16:46:57 +01:00
Brendan Abolivier
145291108d
Add tests for inviting with access rules
2019-06-18 16:32:54 +01:00
Brendan Abolivier
2a1f35193b
Remove unused imports
2019-06-18 14:57:04 +01:00
Brendan Abolivier
a09767d57d
Lint
2019-06-18 14:55:24 +01:00
Brendan Abolivier
bc0fd8f170
Add tests for room creation hook
2019-06-18 14:54:19 +01:00
Brendan Abolivier
5c4296b47a
Merge branch 'babolivier/third_party_event_rules' into dinsic
2019-06-14 19:38:44 +01:00
Brendan Abolivier
f874b16b2e
Add plugin APIs for implementations of custom event rules.
2019-06-14 18:16:03 +01:00
Brendan Abolivier
c7964e7430
Fix test
2019-06-14 16:25:18 +01:00
Brendan Abolivier
aded5cfb72
Don't send renewal emails to deactivated users
2019-06-14 15:39:18 +01:00
Brendan Abolivier
57bd5cfc9a
Track deactivated accounts in the database ( #5378 )
2019-06-14 13:45:36 +01:00
Amber H. Brown
a10c8dae85
fix prometheus rendering error
2019-06-14 21:09:33 +10:00
Amber Brown
6312d6cc7c
Expose statistics on extrems to prometheus ( #5384 )
2019-06-13 22:40:52 +10:00
Brendan Abolivier
8400e5f624
Merge branch 'dinsic' into babolivier/userdir_hide_users
2019-06-12 16:29:56 +01:00
Brendan Abolivier
d907e8f599
Merge branch 'master' into dinsic
2019-06-12 14:36:44 +01:00
Erik Johnston
7e68691ce9
Merge branch 'master' of github.com:matrix-org/synapse into develop
2019-06-11 17:25:16 +01:00
Erik Johnston
a766c41d25
Bump bleach version so that tests can run on old deps.
2019-06-11 12:34:18 +01:00
Erik Johnston
10383e6e6f
Change password reset links to /_matrix.
2019-06-11 11:34:33 +01:00
Brendan Abolivier
3c8262b181
Merge branch 'master' into dinsic
2019-06-11 10:55:53 +01:00
Erik Johnston
abce00fc6a
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop
2019-06-10 18:33:55 +01:00
Erik Johnston
a6b1817940
Merge pull request #5417 from matrix-org/rav/shared_ssl_context
...
Share an SSL context object between SSL connections
2019-06-10 18:16:12 +01:00
Richard van der Hoff
db74c4fc6c
fix ci on py2, again
2019-06-10 17:55:01 +01:00
Richard van der Hoff
19780a521e
fix CI on python 2.7
2019-06-10 17:41:10 +01:00
Brendan Abolivier
c10226581a
Lint
2019-06-10 17:25:42 +01:00
Brendan Abolivier
10510f1e7e
Lint
2019-06-10 17:23:11 +01:00
Brendan Abolivier
1924848dfa
Add test case
2019-06-10 17:16:17 +01:00
Richard van der Hoff
e016681221
Tests for SSL certs for federation connections
...
Add some tests for bad certificates for federation and .well-known connections
2019-06-10 16:14:20 +01:00
Erik Johnston
0382b0ffee
Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_ms
...
Fix key verification when key stored with null valid_until_ms
2019-06-10 15:56:36 +01:00
Erik Johnston
43badd2cd4
Fix key verification when key stored with null valid_until_ms
...
Some keys are stored in the synapse database with a null valid_until_ms
which caused an exception to be thrown when using that key. We fix this
by treating nulls as zeroes, i.e. they keys will match verification
requests with a minimum_valid_until_ms of zero (i.e. don't validate ts)
but will not match requests with a non-zero minimum_valid_until_ms.
Fixes #5391 .
2019-06-10 15:37:10 +01:00
Brendan Abolivier
8d16321edc
Merge branch 'babolivier/account_validity_send_mail_auth' into dinsic
2019-06-10 11:59:20 +01:00
Brendan Abolivier
26b62796c2
Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mail_auth
...
Don't check whether the user's account is expired on /send_mail requests
2019-06-10 11:57:02 +01:00
Andrew Morgan
2d1d7b7e6f
Prevent multiple device list updates from breaking a batch send ( #5156 )
...
fixes #5153
2019-06-06 23:54:00 +01:00
Neil Johnson
a11865016e
Set default room version to v4. ( #5379 )
...
Set default room version to v4.
2019-06-06 20:13:47 +01:00