Commit Graph

113 Commits

Author SHA1 Message Date
Son NK
362d101bab Merge branch 'master' into multiple-mailboxes
# Conflicts:
#	app/dashboard/templates/dashboard/custom_alias.html
#	email_handler.py
#	templates/emails/com/newsletter/mobile-darkmode.html
2020-05-16 11:28:25 +02:00
Son NK
092d934feb improve wording 2020-05-13 22:55:15 +02:00
Son NK
d802615faa improve newsletter wording 2020-05-13 22:46:57 +02:00
Son NK
ec2d912bb8 mobile-darkmode newsletter 2020-05-13 22:43:03 +02:00
Son NK
37271d10ed mobile-darkmode newsletter 2020-05-13 22:08:14 +02:00
Son NK
2bc2643cc8 use logo in email base template 2020-05-11 23:23:19 +02:00
Son NK
50a105f156 fix mailbox newsletter 2020-05-11 14:44:57 +02:00
Son NK
336bdb196d Detect unknown mailbox using envelope mail_from 2020-05-10 20:09:54 +02:00
Son NK
9ddb8ff2d4 add more info to spf alert email. Set the max number of emails per 24h to 1 2020-05-10 10:37:56 +02:00
Son NK
ac4e1fab77 email template to alert SPF 2020-05-09 22:58:38 +02:00
Son NK
ef2a385563 redirect user to TOTP in welcome email 2020-05-07 17:58:36 +02:00
Son NK
5e174b08f4 Add Android app to browser-extension email 2020-05-02 11:00:03 +02:00
Son NK
9cd41fbae2 Add iOS app link to browser-extension email 2020-04-26 13:16:49 +02:00
Son NK
f7f1e7f358 replace user.next_bill_date() by sub.next_bill_date.strftime("%Y-%m-%d") 2020-04-19 10:54:05 +02:00
Son NK
f34ef8781c Do not hardcode MAX_NB_EMAIL_FREE_PLAN in email templates 2020-04-08 23:08:34 +02:00
Son NK
6a19390e3f Create text() macro, no more variable concatenation as render_text()! 2020-04-08 23:07:38 +02:00
Son NK
d9d22a56e2 Update to 15 aliases in free plan 2020-04-08 22:38:25 +02:00
Son NK
3a845af2fa use website_email instead of website_from in spam-email 2020-04-05 12:00:01 +02:00
Son NK
a081298756 use website_email instead of website_from in bounce-email 2020-04-05 11:59:24 +02:00
Son NK
b2f22db9f6 use website_email instead of website_from for automatic-disable-alias email 2020-04-05 11:58:13 +02:00
Son NK
27d048f70b add send-from-alias-from-unknown-sender template in html 2020-04-03 23:39:07 +02:00
Son NK
58ca77e2ae Add browser extension onboarding email 2020-04-02 23:26:17 +02:00
Son NK
85d36f2eac Improve welcome email 2020-04-02 23:24:52 +02:00
Son NK
9500cc6cee Take into account spamassassin spam report 2020-03-30 22:05:31 +02:00
Son NK
917009a803 Improve bounced email wording 2020-03-30 21:45:43 +02:00
Son NK
da6441b4b8 Handle on-click unsubcribe 2020-03-28 23:19:25 +01:00
Son NK
f4d28a998a fix email wording 2020-03-24 21:21:55 +01:00
Son NK
9e04081186 send mailbox onboarding email 2020-03-24 21:19:45 +01:00
Son NK
c02b8298fc send pgp onboarding email to user on 2nd day 2020-03-24 21:01:38 +01:00
Son NK
929e965f23 rename onboarding-1 to onboarding/send-from-alias 2020-03-24 20:55:50 +01:00
Son NK
3f1716d9ec pgp newsletter 2020-03-24 20:12:56 +01:00
Son NK
f99f656872 increase max-width to 750px (old value 570px), reduce padding to 30px (old value: 45px) 2020-03-24 20:11:55 +01:00
Son NK
7f75e05148 mention mailbox in trial-end email 2020-03-19 19:21:47 +01:00
Son NK
5f6cef4c96 Mention PGP in trial end email 2020-03-19 19:20:44 +01:00
Son Nguyen Kim
44e2e175ef
Merge pull request #115 from simple-login/rename
Rename
2020-03-19 10:39:05 +01:00
Son NK
3f81b92d61 Add PGP to welcome email 2020-03-18 22:29:30 +01:00
Son NK
4f281bdbbb rename GenEmail -> Alias, gen_email to alias whenever possible 2020-03-17 11:51:40 +01:00
Son NK
b19be41a5e Support download email file in browser 2020-03-15 18:39:59 +01:00
Son NK
eb3063a57f Improve wording 2020-03-15 18:06:57 +01:00
Son NK
4b21f49f49 add mailbox email into notif email 2020-03-15 12:25:01 +01:00
Son NK
0525e5822a Not include original email in automatic disable alias email 2020-03-15 10:50:46 +01:00
Son NK
0bb9830680 Store the bounced email in email handling. 2020-03-14 16:34:23 +01:00
Son NK
52f364d73b notify user with premium plan ending soon 2020-03-05 09:35:20 +01:00
Son NK
e2b086c449 Prepare newsletter 2020-02-29 00:12:37 +07:00
Son NK
32cd2fd650 Add related endpoints for registration
POST /api/auth/register
POST /api/auth/activate
POST /api/auth/reactivate
2020-02-28 19:02:01 +07:00
Son NK
45178795f4 Change text email signature 2020-02-28 18:14:18 +07:00
Son NK
368c4a48ee Improve trial-end email 2020-02-23 17:01:47 +07:00
Son NK
c1bd2f83e3 Remind user that their manual sub is ending soon. 2020-02-23 17:01:23 +07:00
Son NK
3708071320 Improve welcome & trial-end email 2020-02-23 16:01:22 +07:00
Son NK
731d898774 Handle mailbox change 2020-02-23 14:08:55 +07:00