Commit Graph

6 Commits

Author SHA1 Message Date
Alex S
c349573791 Merge develop to 788-separate-email-addresses
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
2019-04-13 12:24:38 +07:00
Alex S
a64eb2b389 fallback to the old behaviour
admin and user mailers
2019-04-13 12:20:36 +07:00
Alex S
fe13a1d78c adding notify_email setting for trigger emails 2019-04-10 17:57:41 +07:00
Haelwenn (lanodan) Monnier
cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/ 2019-04-10 06:33:20 +02:00
William Pitcock
27e03a2177 reports: fix up email generation for remote reports 2019-03-22 01:17:14 +00:00
Egor
bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00