39883e85bd
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-09-06 12:50:28 +01:00
0c0b82b6d1
Allow Synapse to send registration emails + choose Synapse or an external server to handle 3pid validation ( #5987 )
...
This is a combination of a few different PRs, finally all being merged into `develop`:
* #5875
* #5876
* #5868 (This one added the `/versions` flag but the flag itself was actually [backed out](891afb57cb (diff-e591d42d30690ffb79f63bb726200891)#5969 . What's left is just giving /versions access to the config file, which could be useful in the future)
* #5835
* #5969
* #5940
Clients should not actually use the new registration functionality until https://github.com/matrix-org/synapse/pull/5972 is merged.
UPGRADE.rst, changelog entries and config file changes should all be reviewed closely before this PR is merged.
2019-09-06 11:35:28 +01:00
e80a5b7492
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-09-04 13:13:30 +01:00
4548d1f87e
Remove unnecessary parentheses around return statements ( #5931 )
...
Python will return a tuple whether there are parentheses around the returned values or not.
I'm just sick of my editor complaining about this all over the place :)
2019-08-30 16:28:26 +01:00
a7efbc5416
Merge branch 'release-v1.3.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-08-13 15:54:01 +01:00
96bdd661b8
Remove redundant return
2019-08-13 12:50:36 +01:00
873ff9522b
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-08-01 14:46:09 +01:00
d02e41dcb2
Handle pusher being deleted during processing.
...
Instead of throwing a StoreError lets break out of processing loop and
mark the pusher as stopped.
2019-08-01 13:44:12 +01:00
2e697d3013
Explicitly check that tombstone is a state event before notifying.
2019-07-31 16:32:03 +01:00
65fe31786d
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-07-30 10:12:13 +01:00
4806651744
Replace returnValue with return ( #5736 )
2019-07-23 23:00:55 +10:00
5299707329
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-07-17 10:56:55 +01:00
9b1b79f3f5
Add default push rule to ignore reactions ( #5623 )
...
This adds a default push rule following the proposal in
[MSC2153](https://github.com/matrix-org/matrix-doc/pull/2153 ).
See also https://github.com/vector-im/riot-web/issues/10208
See also https://github.com/matrix-org/matrix-js-sdk/pull/976
2019-07-05 17:37:52 +01:00
463b072b12
Move logging utilities out of the side drawer of util/ and into logging/ ( #5606 )
2019-07-04 00:07:04 +10:00
67b73fd147
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-21 13:27:04 +01:00
f47969f42a
Improve email notification logging ( #5502 )
2019-06-20 15:14:26 +01:00
32e7c9e7f2
Run Black. ( #5482 )
2019-06-20 19:32:02 +10:00
c08e4dbadc
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-17 14:10:28 +01:00
dd927b29e1
Merge pull request #5388 from matrix-org/erikj/fix_email_push
...
Fix email notifications for unnamed rooms with multiple people
2019-06-17 13:54:35 +01:00
03b09b32d6
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-11 14:00:50 +01:00
10383e6e6f
Change password reset links to /_matrix.
2019-06-11 11:34:33 +01:00
aad993f24d
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-10 16:05:10 +01:00
2ebeda48b2
Add test
2019-06-07 12:15:33 +01:00
928d1ccd73
Fix email notifications for large unnamed rooms.
...
When we try and calculate a description for a room for with no name but
multiple other users we threw an exception (due to trying to subscript
result of `dict.values()`).
2019-06-07 12:15:28 +01:00
3719680ee4
Add ability to perform password reset via email without trusting the identity server ( #5377 )
...
Sends password reset emails from the homeserver instead of proxying to the identity server. This is now the default behaviour for security reasons. If you wish to continue proxying password reset requests to the identity server you must now enable the email.trust_identity_server_for_password_resets option.
This PR is a culmination of 3 smaller PRs which have each been separately reviewed:
* #5308
* #5345
* #5368
2019-06-06 17:34:07 +01:00
7467738834
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2019-05-02 13:37:35 +01:00
8c5b1e30d4
Add a default .m.rule.tombstone push rule ( #4867 )
...
* Add a default .m.rule.tombstone push rule
In support of MSC1930: https://github.com/matrix-org/matrix-doc/pull/1930
* changelog
* Appease the changelog linter
2019-04-29 15:40:31 -06:00
91934025b9
Merge pull request #5047 from matrix-org/babolivier/account_expiration
...
Send out emails with links to extend an account's validity period
2019-04-17 14:57:39 +01:00
20f0617e87
Send out emails with links to extend an account's validity period
2019-04-17 14:42:20 +01:00
aadba440da
Point pusher to new box
2019-04-15 19:23:21 +01:00
613b443ff0
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-04-02 18:25:45 +01:00
5bec8d660d
Make starting pushers faster during start up
...
We start all pushers on start up and immediately start a background
process to fetch push to send. This makes start up incredibly painful
when dealing with many pushers.
Instead, let's do a quick fast DB check to see if there *may* be push to
send and only start the background processes for those pushers. We also
stagger starting up and doing those checks so that we don't try and
handle all pushers at once.
2019-04-02 16:59:13 +01:00
0ea52872ab
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-02-22 15:29:41 +00:00
b82c9cf462
Add missing return
2019-02-22 15:27:40 +00:00
f2891d2487
Correctly handle PusherConfigException
2019-02-22 15:18:19 +00:00
a164134a53
Drop logging level of creating a pusher
2019-02-22 14:48:06 +00:00
1d9df51ff1
Correctly handle null data in HttpPusher
2019-02-22 14:47:48 +00:00
e07384c4e1
Add prometheus metrics for number of badge update pushes. ( #4709 )
...
We're counting the number of push notifications, but not the number of badges;
I'd like to see if they are significant.
2019-02-22 10:57:15 +00:00
0abb094f1a
bail out early in on_new_receipts if no pushers ( #4706 )
2019-02-21 17:51:21 +00:00
6868d53fe9
bail out early in on_new_receipts if no pushers
2019-02-21 15:58:15 +00:00
4da63d9f6f
Merge branch 'develop' into matrix-org-hotfixes
2019-02-20 14:15:56 +00:00
b2200a8690
Logging improvements for the pusher ( #4691 )
2019-02-20 11:36:50 +00:00
085d69b0bd
Apply the pusher http hack in the right place ( #4692 )
...
Do it in the constructor, so that it works for badge updates as well as pushes
2019-02-20 11:25:10 +00:00
d351be1567
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-01-30 11:48:29 +00:00
3f189c902e
Fix flake8 ( #4519 )
2019-01-30 10:53:17 +00:00
3dd704ee9a
Merge branch 'develop' into matrix-org-hotfixes
2018-11-20 11:29:45 +00:00
f5faf6bc14
Fix logcontext leak in EmailPusher
2018-11-19 17:07:01 +00:00
34406cf22c
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2018-11-06 10:49:20 +00:00
b86d05a279
Clean up event accesses and tests
...
This is in preparation to refactor FrozenEvent to support different
event formats for different room versions
2018-11-02 13:44:14 +00:00
f91aefd245
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2018-10-31 04:41:03 +11:00
Erik Johnston