David Baker
|
92f0f3d21d
|
Catch all exceptions when creating a pusher
|
2016-05-04 11:24:07 +01:00 |
|
David Baker
|
2df75de505
|
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
|
2016-04-29 20:28:47 +01:00 |
|
David Baker
|
b084e4d963
|
Add constant for throttle multiplier
|
2016-04-29 20:14:55 +01:00 |
|
David Baker
|
35b7b8e4bc
|
Remove unused function
|
2016-04-29 20:10:34 +01:00 |
|
David Baker
|
6b9b6a9169
|
Remove unused arg
|
2016-04-29 20:02:52 +01:00 |
|
David Baker
|
c7c75e87dc
|
Docstring
|
2016-04-29 19:47:35 +01:00 |
|
David Baker
|
b0a1036d93
|
Use explicit join
|
2016-04-29 19:28:56 +01:00 |
|
David Baker
|
8f99cd5996
|
Oops, actually specify the user id
|
2016-04-29 19:27:03 +01:00 |
|
David Baker
|
60f44c098d
|
Remove unnecessary if
|
2016-04-29 19:17:10 +01:00 |
|
David Baker
|
50ad8005e4
|
Put spaces at start of line
|
2016-04-29 19:16:15 +01:00 |
|
David Baker
|
83618d719a
|
Try imports in config
|
2016-04-29 19:13:52 +01:00 |
|
David Baker
|
e7a76b5123
|
Use the constant
|
2016-04-29 19:10:45 +01:00 |
|
David Baker
|
29c8cf8db8
|
Avoid `vars` builtin
|
2016-04-29 19:09:28 +01:00 |
|
David Baker
|
d3da5294e8
|
Use named parameter format
|
2016-04-29 19:04:40 +01:00 |
|
David Baker
|
765f2b8446
|
Default enable email notifs to False
|
2016-04-29 14:46:18 +01:00 |
|
David Baker
|
311b5ce051
|
pep8
|
2016-04-29 14:37:30 +01:00 |
|
David Baker
|
3facde2536
|
Remove rather pointless get function
|
2016-04-29 14:36:45 +01:00 |
|
David Baker
|
4364ea1272
|
Stop processing notifs once we've sent a mail
|
2016-04-29 14:31:27 +01:00 |
|
David Baker
|
4b0c3a3270
|
Correct public_baseurl default
|
2016-04-29 14:30:15 +01:00 |
|
David Baker
|
5048455965
|
Nicer get() shorthand
|
2016-04-29 14:27:40 +01:00 |
|
David Baker
|
6c8957be7f
|
Remove redundant docstring
|
2016-04-29 14:25:28 +01:00 |
|
David Baker
|
18ce88bd2d
|
Correct default template and add text template
|
2016-04-29 14:24:25 +01:00 |
|
David Baker
|
40d40e470d
|
Send mail notifs with a plaintext part too
|
2016-04-29 13:56:21 +01:00 |
|
David Baker
|
dc2c527ce9
|
Fix password reset
Default requester to None, otherwise it isn't defined when resetting using email auth
|
2016-04-29 12:07:54 +01:00 |
|
David Baker
|
b2c04da8dc
|
Add an email pusher for new users
If they registered with an email address and email notifs are enabled on the HS
|
2016-04-29 11:43:57 +01:00 |
|
David Baker
|
ec9cbe847d
|
pep8 newline
|
2016-04-29 10:07:30 +01:00 |
|
David Baker
|
acded821c4
|
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
|
2016-04-29 10:05:20 +01:00 |
|
David Baker
|
e800ee2f63
|
May as well always include room link
|
2016-04-28 17:28:27 +01:00 |
|
David Baker
|
cc0874cf71
|
Put back real delay before mailing
|
2016-04-28 17:00:40 +01:00 |
|
David Baker
|
68f8fc2f14
|
Support file messages & fix plain text
|
2016-04-28 16:59:57 +01:00 |
|
David Baker
|
4845c7359d
|
Support image notifs
|
2016-04-28 15:55:53 +01:00 |
|
Mark Haines
|
351b50a887
|
Fix more typos in per-request metrics
|
2016-04-28 15:29:46 +01:00 |
|
David Baker
|
60f86fc876
|
pep8
|
2016-04-28 15:16:30 +01:00 |
|
David Baker
|
937c407eef
|
Only import email pusher if email notifs are on
|
2016-04-28 15:12:14 +01:00 |
|
Mark Haines
|
dcfc10b129
|
Fix typo in request metrics
|
2016-04-28 15:11:06 +01:00 |
|
Matthew Hodgson
|
aebd0c9717
|
fix typo
|
2016-04-28 15:09:25 +01:00 |
|
Mark Haines
|
1a12766e3b
|
Add a comment explaining why automatic metric reporting is disabled for JsonResource
|
2016-04-28 12:31:26 +01:00 |
|
Mark Haines
|
6037349512
|
Check if report_metrics is True
|
2016-04-28 12:26:07 +01:00 |
|
David Baker
|
ebbabc4986
|
Handle room invites in email notifs
|
2016-04-28 11:49:36 +01:00 |
|
Mark Haines
|
8d7ad44331
|
Report per request metrics for all of the things using request_handler
|
2016-04-28 10:57:49 +01:00 |
|
David Baker
|
9dba1b668c
|
Linkify plain text messages too
|
2016-04-28 10:55:08 +01:00 |
|
David Baker
|
424a7f48f8
|
Run filter_events_for_client
so we don't accidentally mail out events people shouldn't see
|
2016-04-27 17:50:49 +01:00 |
|
David Baker
|
4ed1e45869
|
Make html messages work
|
2016-04-27 17:18:51 +01:00 |
|
Mark Haines
|
21d188bf95
|
Merge pull request #755 from matrix-org/markjh/right_direction
Fix backfill replication to advance the stream correctly
|
2016-04-27 15:54:48 +01:00 |
|
Mark Haines
|
8a65666454
|
Fix backfill replication to advance the stream correctly
|
2016-04-27 15:38:43 +01:00 |
|
David Baker
|
8781083960
|
Better grammar for multiple messages in a room
Say who the messages are from if there's no room name, otherwise it's a bit nonsensical
|
2016-04-27 15:30:41 +01:00 |
|
David Baker
|
fa12209c1b
|
Hopefully all remaining bits for email notifs
Add public facing base url to the server so synapse knows what URL to use when converting mxc to http urls for use in emails
|
2016-04-27 15:09:55 +01:00 |
|
Mark Haines
|
871357d539
|
Check that somethign has happend before running the selects
|
2016-04-27 11:54:13 +01:00 |
|
Mark Haines
|
71df327190
|
Actually start the pusher daemon
|
2016-04-26 17:07:09 +01:00 |
|
Mark Haines
|
c9eab73f2a
|
Fix typo in default pusher config
|
2016-04-26 17:06:18 +01:00 |