e853cfe7c3
Revert "Merge branch 'copyright-bump' into 'develop'"
...
This reverts merge request !3825
2023-01-02 20:38:50 +00:00
10886eeaa2
Bump copyright year
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-01 12:13:06 +01:00
d7c53da77a
Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop'
...
Translate backend-rendered pages
See merge request pleroma/pleroma!3634
2022-03-20 18:14:37 +00:00
0149ea4538
Send emails i18n'd using backend-stored user language
2022-03-01 22:19:13 -05:00
af82f09ce3
Make all emails translatable
2022-03-01 20:45:59 -05:00
17aa3644be
Copyright bump for 2022
2022-02-25 23:11:42 -07:00
9879c18548
Avoid `use Phoenix.Swoosh` to prevent recompiling the Endpoint
...
Speeds up recompilation by fixing cycles in UserEmail
2021-06-01 16:17:03 -05:00
4cacce4b42
Revert "Add plaintext support for all emails except the digest"
...
This reverts commit 5df9f68392
2021-02-08 16:39:55 -06:00
0368419fce
Slightly better formatting
2021-02-05 09:13:53 -06:00
5df9f68392
Add plaintext support for all emails except the digest
2021-02-05 09:13:17 -06:00
e945ccc91b
Add a registration email that only sends if no other emails (welcome, approval, confirmation) are enabled
2021-02-04 15:16:50 -06:00
2956c21a55
Improve confirmation email language
2021-02-04 15:10:43 -06:00
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
2021-01-13 07:49:50 +01:00
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
2021-01-04 13:38:31 +01:00
80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-12-17 09:05:36 -06:00
cebe3c7def
Fix for dropping posts/notifs in WS when mix task is executed
...
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
2020-12-14 11:02:32 -06:00
9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-11-14 19:48:47 -06:00
28005563f0
Send approval pending email during registration
2020-10-11 20:50:09 -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
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
3edaecae96
added welcome email
2020-07-21 09:25:53 +03:00
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
158231cd20
Add configurable colors and logo for the digest template
2019-08-16 18:32:25 +07: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
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
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
6a6a5b3251
de-group alias/es
2019-02-09 16:31:17 +01:00
980b5288ed
update copyright years to 2019
2018-12-31 15:41:47 +00:00
2791ce9a1f
add license boilerplate to pleroma core
2018-12-23 20:56:42 +00:00
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
2018-12-20 13:41:30 +03:00
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
2018-12-18 17:21:05 +03:00
07e93f9940
[ #114 ] Improved tests.
2018-12-14 13:52:04 +03:00
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
2018-12-14 12:28:22 +03:00
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
2018-12-14 12:28:14 +03:00
9e689de063
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
2018-12-13 16:24:30 +03:00
00744c6b03
[ #114 ] Initial implementation of user email invitations.
2018-12-13 14:30:48 +03:00
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
2018-12-12 17:04:39 +03:00
lain