Commit Graph

218 Commits

Author SHA1 Message Date
Son NK
a4d17e7afc use multiple-select instead of bootstrap-select 2020-05-16 12:17:26 +02:00
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