6d850c46dc
AdminEmail: Use AP id as user url.
2020-11-04 17:12:47 +01:00
1fb9452131
Merge branch 'develop' into feature/account-export
2020-10-14 15:27:15 -05:00
3ca98878d2
Deep link to the user account in AdminFE in account confirmation emails
2020-10-09 17:08:05 -05:00
8baee855d9
Fix emails
2020-10-07 18:35:27 +04:00
7c22c9afb4
Allow admins request user backups
2020-10-07 18:34:31 +04:00
7fdd81d000
Add "Your backup is ready" email
2020-10-07 18:34:30 +04:00
8b6ac45f3c
Allow emails to be sent again, #2101 #2172
...
https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707
2020-09-21 13:28:02 -05:00
4727030f59
fixes for mix tasks
...
- fix for `mix pleroma.database update_users_following_followers_counts`
- raise error, if fetch was unsuccessful in emoji tasks
- fix for `pleroma.digest test` task
2020-08-19 11:06:03 +03:00
f688c8df82
Fix User.registration_reason HTML sanitizing issues
2020-07-27 20:36:31 -05:00
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-27 12:29:18 -05:00
3edaecae96
added welcome email
2020-07-21 09:25:53 +03:00
0d004a9d04
Email admins when a new unapproved account is up for review
2020-07-14 20:31:20 -05:00
2b979cc90c
Add AdminFE reports URL to report emails
2020-07-09 11:55:40 -05:00
d23804f191
Use the Pleroma.Config alias
2020-07-09 10:53:51 -05:00
b7fc61e17b
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
2020-05-21 04:41:42 +03:00
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
50d9fcbe29
Hotlink logo instead of attachment
2020-02-11 23:33:05 +04:00
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
2020-02-11 13:54:55 +04:00
12b6fcdb8c
Merge branch 'features/task-test-email' into 'develop'
...
Create pleroma.email mix task
Closes #1061
See merge request pleroma/pleroma!2118
2020-01-28 16:42:57 +00:00
4eb935be78
Create pleroma.email mix task
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
2020-01-28 16:49:38 +01:00
df0b8f1d08
Add new users digest email
2020-01-22 20:31:42 +04:00
22fc271e23
init tag feed
2019-12-06 09:33:40 +03:00
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
4b3f77a99f
Extract RSS Feed functionality from OStatus
2019-10-07 12:20:41 +00:00
1d8e956c32
Use the user.id instead of nickname in report URLs
...
Ensures links to profiles of remote users work.
2019-10-06 14:13:04 +00:00
dd017c65a4
[ #1149 ] Refactored Oban workers API (introduced `enqueue/3`).
2019-08-31 21:58:42 +03:00
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
2019-08-31 19:08:56 +03:00
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
2019-08-22 20:59:58 +03:00
158231cd20
Add configurable colors and logo for the digest template
2019-08-16 18:32:25 +07:00
a180c1360e
[ #1149 ] Oban mailer job. Adjusted tests.
2019-08-14 21:42:21 +03:00
c9970feee2
Fix compatibility with Elixir 1.8
2019-08-14 21:03:25 +07:00
4b7f1c6995
Improve digest email template
2019-08-14 20:46:05 +07:00
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
96028cd585
Remove Reply-To from report emails
2019-08-04 22:24:50 +00:00
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
12b1454245
[ #1062 ] added option to disable send email
2019-07-10 05:34:21 +00:00
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
a0c4ebb4d7
[ #184 ] small refactoring reset password
2019-06-24 19:01:56 +00:00
3e17610587
Add task to test emails
2019-06-04 02:48:21 +03:00
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
e2b3a27204
Add Reports to Admin API
2019-05-16 19:09:18 +00:00
64a2c6a041
Digest emails
2019-04-20 19:42:19 +07:00
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
a64eb2b389
fallback to the old behaviour
...
admin and user mailers
2019-04-13 12:20:36 +07:00
fe13a1d78c
adding notify_email setting for trigger emails
2019-04-10 17:57:41 +07:00
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
2019-04-10 06:33:20 +02:00
cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/
2019-04-10 06:33:20 +02:00
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
2019-04-10 06:33:19 +02:00
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
2019-03-29 12:46:05 +00:00
lain