Commit Graph

317 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
a7a29ab8c9 fix file name 2020-05-15 23:53:17 +02:00
Son NK
c9b75c338e move theme.js to static/ and include it in base.html 2020-05-15 23:40:30 +02:00
Sibren Vasse
bdc3102420 Fix space error footer 2020-05-15 13:42:48 +02:00
Sibren Vasse
c6e291f7e8 Dark theme: prevent white flash on page load 2020-05-15 13:42:48 +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
6058257509 add bootstrap-select 2020-05-10 20:09:54 +02:00
doanguyen
7ef78c991f Dark mode implementation
* Using CSS variable as a solution
* The new darkmode css is now live in another file so that upgarding
dashboard.css doesn't affect the darkmode itself
* Used a naive darkmode controller by client javascript. No persistance
state is stored in the backend at the moment
2020-05-10 16:52:14 +02:00
Son NK
b47b74d98a Give more info on the trial period 2020-05-10 10:54:19 +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
2df6b8023d remove notie 2020-04-30 22:39:23 +02:00
Son NK
7277c30735 use bootbox instead of notie 2020-04-30 22:37:39 +02:00
Son NK
96366ddcfa Deprecate social login, prettify some pages 2020-04-27 23:08:21 +02:00
Son NK
5bcc2138cf Fix wording in menu: use plurial for consistency 2020-04-26 18:49:46 +02:00
Son NK
9cd41fbae2 Add iOS app link to browser-extension email 2020-04-26 13:16:49 +02:00
Son NK
ad7d8741f6 reduce top space in default template 2020-04-25 13:43:15 +02:00
Son NK
fc4572e9ba make logo a bit smaller 2020-04-24 09:43:26 +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
260ded14ea rename should_upgrade -> should_show_upgrade_button 2020-04-13 20:49:35 +02:00
Son NK
51eb550751 fix not using lifetime_or_active_subscription 2020-04-12 19:39:47 +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
af9178e216 Use non-beta logo 2020-04-05 18:58:22 +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
e9208810af Return user to login page in case of 401 2020-04-01 20:32:08 +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
e02fbe0979 add uptime link to footer 2020-03-09 22:23:00 +01:00
Son NK
52f364d73b notify user with premium plan ending soon 2020-03-05 09:35:20 +01:00
Son NK
3492935f95 Canceled user can upgrade again: the payment method is changed immediately though 2020-03-05 09:13:28 +01:00
Son NK
83d32244a5 remove Beta tag on mailboxes 2020-03-05 08:56:47 +01:00
Son NK
e2b086c449 Prepare newsletter 2020-02-29 00:12:37 +07:00
Son NK
aeed62e95b All users use full-mailbox
- remove can_use_multiple_mailbox col
- remove full_mailbox col
2020-02-29 00:03:35 +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
362032b803 full_mailbox user can use mailbox 2020-02-23 14:09:57 +07:00
Son NK
731d898774 Handle mailbox change 2020-02-23 14:08:55 +07:00
Son Nguyen Kim
773e24dd9a
Merge pull request #90 from simple-login/handle-bounced
Handle bounced
2020-02-22 22:37:11 +07:00
Son NK
8e2ff474cb Add feature request link to footer 2020-02-22 21:47:45 +07:00
Son NK
2bba342447 remove preheader 2020-02-22 20:57:28 +07:00
Son NK
78ef1cb8d4 notify user when emails sent to alias are bounced. 2020-02-22 20:57:19 +07:00
Son NK
02fc782df0 fix reply-must-use... email 2020-02-15 22:42:28 +07:00
Son NK
4cd526513c Improve change-email wording 2020-02-12 18:38:18 +07:00
Son NK
ee1bbd722f Move settings tab to the end 2020-02-12 18:34:59 +07:00
Son NK
e3b28feaf0 Improve reset-password email wording 2020-02-12 18:13:31 +07:00
Son NK
1f41007f3d Add what-next to trial-end email 2020-02-12 18:11:37 +07:00
Son NK
7905c481f2 improve trial-end email 2020-02-12 16:38:58 +07:00
Son NK
226cb4bac4 improve verify-mailbox 2020-02-12 16:37:47 +07:00
Son NK
95e60fbf86 Improve password-reset email 2020-02-12 16:35:22 +07:00
Son NK
ac12e1677b improve reply-must-use-personal-email email 2020-02-12 16:33:31 +07:00
Son NK
e841201944 improve change-email template 2020-02-12 12:51:31 +07:00
Son NK
b56cbe7dd7 Improve cannot-create-domain email 2020-02-12 12:49:09 +07:00
Son NK
2287f099aa improve cannot-create-dir email 2020-02-12 12:47:48 +07:00
Son NK
4e46905967 Improve activation email 2020-02-12 12:44:32 +07:00
Son NK
7f909f5a96 Improve onboarding-1 email 2020-02-12 12:41:25 +07:00
Son NK
b929db5be9 Better new-app email 2020-02-12 12:20:24 +07:00
Son NK
55e9344d75 Better welcome email 2020-02-12 12:18:57 +07:00
Son NK
0643eb163b Use postmark email templates 2020-02-12 12:11:17 +07:00
Son NK
9726c577cb Improve emails 2020-02-11 23:15:50 +07:00
Son NK
7598a167d0 Improve emails that inform unauthorized user 2020-02-11 22:58:30 +07:00
Son NK
b41a61165c use mailbox_email when notifying user attempt to send from his alias 2020-02-11 22:46:53 +07:00
Son NK
d1241c6e18 remove Premium badge from custom domain 2020-02-11 22:43:52 +07:00
Son NK
eec2020f0f only user with can_use_multiple_mailbox enabled can use this feature 2020-02-11 22:43:32 +07:00
Son NK
890bf1b3ed Add Mailbox to pricing, remove beta badge from directory 2020-02-10 23:52:41 +07:00
Son NK
8a531f6c86 User can add/delete/verify mailbox 2020-02-10 23:17:05 +07:00
Son NK
4b5d806ef3 Improve welcome and safari-extension email 2020-02-08 22:44:33 +07:00
Son NK
dd02a50bad Improve wordings
- forgot password page
- login page
- activation email
- reset password email
2020-02-06 11:37:10 +07:00
Son NK
462937975f remove email footer 2020-02-05 21:35:54 +07:00
Son NK
6fe689dc17 use store instead of localStorage to detect whether the intro has been shown 2020-02-05 14:33:00 +07:00
Son NK
b40278f4dc use store instead of localStorage to disable GoatCounter 2020-02-05 14:30:27 +07:00
Son NK
2f9764e54a improve onboarding-1 email 2020-02-05 00:19:24 +07:00
Son NK
3483faa34a Merge branch 'master' into welcome-email-serie 2020-02-04 18:30:02 +07:00
Son NK
e0e5029d18 install sentry from npm 2020-02-04 18:14:27 +07:00
Son NK
6be5d53e4e Merge branch 'nocdn' into welcome-email-serie
# Conflicts:
#	cron.py
2020-02-04 17:20:35 +07:00
Son NK
31b9abe708 use npm toastr 2020-02-04 16:50:47 +07:00
Son NK
1c328b5219 local bootstrap-social.min.css 2020-02-04 16:48:15 +07:00
Son NK
69d1d74da2 use local introjs 2020-02-04 16:47:50 +07:00
Son NK
754dcfc343 use local font-awesome.min.css with npm 2020-02-04 16:13:25 +07:00
Son NK
c908b6631d use local notie 2020-02-04 16:12:55 +07:00
Son NK
961301214d download font-awesome.min.css 2020-02-04 16:03:38 +07:00
Son NK
608047b736 use key icon instead of browser icon 2020-02-04 15:35:42 +07:00
Son NK
e86c0655dd add Safari extension newsletter 2020-02-03 13:47:34 +07:00
Son NK
9dd7698636 organize emails into transactional/ and com/ 2020-02-03 13:47:13 +07:00
Son NK
db651aa1ea add Safari extension newsletter 2020-02-03 13:46:47 +07:00
Son NK
7c9896c0df update onboarding-1 email 2020-02-03 13:09:21 +07:00
Son NK
cefeb972a2 create onboarding-1 email 2020-02-02 23:38:46 +07:00
Son NK
271ead133b organize emails into transactional/ and com/ 2020-02-02 21:49:22 +07:00
Son NK
f480b1ff54 Use browser icon instead of Chrome icon for api key 2020-02-02 21:01:26 +07:00
Son NK
46fd63fb60 upgrade sentry js 2020-01-30 16:04:54 +07:00
Son NK
baec6fae54 blacklist some urls in Sentry 2020-01-30 16:03:15 +07:00
Son NK
c574824dbd Ignore unactionable Sentry JS errors 2020-01-30 16:02:36 +07:00
Son NK
c14a219758 fix typo 2020-01-30 14:56:55 +07:00
Son NK
8da4557325 send trial ending reminder when trial ends in 2-3 days 2020-01-30 14:19:09 +07:00
Son NK
9383918e96 remove whitelist section from email template 2020-01-30 13:54:56 +07:00
Son NK
01abc48f62 add trial information into welcome email 2020-01-30 13:54:33 +07:00
Son NK
2ca97368f8 Handle trial period
- user can upgrade to lifetime if in trial or free
- free or trial user can buy a subscription
- user has all features when in trial
2020-01-30 10:53:17 +07:00
Son NK
9f95edf203 Move billing button to setting page 2020-01-30 00:29:00 +07:00
Son NK
47ba107738 Improve email template
- remove the grey big border
- use horizontal logo
- add a shell snippet to view quickly email render
2020-01-28 11:58:05 +07:00
Son NK
742cc68aa9 Improve email copy 2020-01-22 23:31:31 +01:00
Son NK
00dac9a95a notify user if reply from alias is NOT sent from their personal email 2020-01-22 23:18:27 +01:00
Son NK
a03db0d129 create email templates 2020-01-16 22:27:45 +01:00
Son NK
3f0aae6f02 send email notifying user that alias creation works only in premium plan 2020-01-16 22:06:36 +01:00
Son NK
8d18708c94 fix jinja error 2020-01-12 22:33:02 +01:00
Son NK
079cafc7b9 Improve welcome email 2020-01-12 22:22:28 +01:00
Son NK
7b40de89d5 adapt email to take into account empty user name 2020-01-11 22:43:17 +01:00
Son NK
97136d025e use 👻 icon when user name is empty 2020-01-11 22:37:40 +01:00
Son NK
5eb4783be2 better welcome email 2020-01-11 22:21:58 +01:00
Son NK
21db3a8637 Upgrade sentry js to 5.11.0 2020-01-10 18:27:50 +01:00
Son NK
457ce71e9b Use Beta badge for Directory feature 2020-01-08 21:41:27 +01:00
Son NK
cdae3c5309 add Directory page to add/delete directory 2020-01-08 21:38:01 +01:00
Son NK
35aa8f1438 add GoatCounter analytics 2020-01-03 23:23:29 +01:00
Son NK
553777bc05 Move intro button to footer 2020-01-02 12:14:49 +01:00
Son NK
21cdb973f0 Improve intro 2020-01-02 12:14:39 +01:00
Son NK
026fe4addd get_subscription should only return *active* subscription. 2020-01-01 19:46:35 +01:00
Son NK
25d8f8926b Prettify UI 2019-12-30 10:36:13 +01:00