Commit Graph

578 Commits

Author SHA1 Message Date
Son Nguyen Kim 93968d00b6
update wording (#1131) 2022-06-30 19:19:22 +02:00
Adrià Casajús 21feced342
Refactor unsubscribe handling (#1090)
* Refactor unsubscribe email handling

* MR comments

* Moved all unsub logic to the encoder

* remove unused

Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-06-30 11:40:01 +02:00
Son Nguyen Kim 44ddd95730
fix coupon page (#1126) 2022-06-29 18:21:49 +02:00
Carlos Quintana cb7868bdca
Add djlint (#1122)
* Add DJlint configuration

* Initial reformat for djlint

* Add template linting to CI

* Add explanation for HTML template checks in CONTRIBUTING.md
2022-06-29 11:28:26 +02:00
Son Nguyen Kim f6a7ee981a
do not send double subscription email (#1118)
* do not send double subscription email

* remove unused import

* remove unused test
2022-06-28 17:51:44 +02:00
Son Nguyen Kim 90b767169b
update welcome proton user email (#1119) 2022-06-28 17:29:05 +02:00
Son Nguyen Kim 75c710a6ab
small refactoring (#1120) 2022-06-28 17:21:23 +02:00
Son Nguyen Kim 89062edc06
show cancel status in "Current plan" section (#1114)
* show cancel status in "Current plan" section

* do not show upgrade button for canceled paddle sub
2022-06-28 11:58:04 +02:00
Carlos Quintana 686f4f3f68
Always check redirect_uri for oauth (#1111)
* Always check redirect_uri for oauth

* Fix OAuth tests
2022-06-27 13:20:18 +02:00
Carlos Quintana f58c4a9a50
Show premium subscription managed by partner (#1112) 2022-06-27 13:17:30 +02:00
Adrià Casajús 9cc9d38dce
Propose upgrade proton account for proton partner users without paid mail plan (#1106)
* Propose upgrade proton account for proton partner users without paid mail plan

* Reformat js

* Initial display via jinja

* tweak ui: add a ---OR--- separator

* use collapse to show SL upgrade option

Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
Co-authored-by: Son <nguyenkims@users.noreply.github.com>
2022-06-23 12:26:02 +02:00
Adrià Casajús db6ec2dbe6
Fix: Missing renamed methods (#1105)
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-06-22 15:34:57 +02:00
Adrià Casajús 99ce10a1bc
Send email to users with a subscription and a partner plan upgrade (#1101)
* Send email to users with a subscription and a partner plan upgrade

* Update double-subscription-partner.html

* Update double-subscription-partner.txt.jinja2

Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
Co-authored-by: Son Nguyen Kim <nguyenkims@users.noreply.github.com>
2022-06-20 14:34:20 +02:00
Adrià Casajús fbb59a1531
Send welcome mail to proton created users (#1099)
* Send welcome mail to proton created users

* Skip import

* Use new logo

Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-06-20 11:36:16 +02:00
Carlos Quintana fb1e14e509
Add Proton logo to sign up page (#1104) 2022-06-20 09:13:19 +02:00
Carlos Quintana b4e3c39329
Add Proton logo to buttons (#1091) 2022-06-15 12:06:11 +02:00
Adrià Casajús efa534fd3e
Store transfer tokens hashed in the db and only allow them to be valid for 24 hours (#1080)
* Store transfer tokens hashed in the db and only allow them to be valid for 30 mins

Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-06-13 12:41:47 +02:00
Son Nguyen Kim 91b3e05ed6
improve wording for data export (#1076) 2022-06-13 08:47:36 +02:00
Son Nguyen Kim a0a92a7562
require user password before transferring an alias (#1070) 2022-06-10 15:50:44 +02:00
Son Nguyen Kim 9cf2f44166
only allow to copy the api key when it is created (#1059)
* show api key created time

* only allow user to copy the api key when it is created

* typo
2022-06-08 10:31:58 +02:00
Son Nguyen Kim 84fcc9ddc4
Notify user cycle email (#1035)
* notify user about a cycle email

* prettify notification detail page
2022-06-07 16:44:57 +02:00
Adrià Casajús e688f04d6b
Send full user report asynchronously on request (#1029)
* Send full user report asynchronously

* Fix test

* Filter some fields before exporting

* Fix: Domain -> CustomDomain

* format settings html

* not include RefusedEmail as they are not usable by user and are automatically deleted

* send the export to the user email

* change email and setting wording

* fix user can only export data once

* remove alias export section

* remove unused import

* fix flake8

Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
Co-authored-by: Son <nguyenkims@users.noreply.github.com>
2022-06-07 10:45:04 +02:00
Son Nguyen Kim 4a839d9a55
Suggest user to use SL reddit for generic question (#1034) 2022-05-30 09:32:10 +02:00
Son Nguyen Kim 6b3ff6f9d9
Merge pull request #1014 from simple-login/improve-wording
add mention about the limit of 15 aliases into the header
2022-05-23 17:11:08 +02:00
Son 53a050d4d1 display user email if user name is empty 2022-05-20 16:35:26 +02:00
Son b8e3db3e11 add mention about the limit of 15 aliases into the header 2022-05-20 16:28:27 +02:00
Son 471003c631 remove New mention on Subdomain 2022-05-20 16:06:58 +02:00
Son 2a2a72342d do not show SIWSL and Apps page 2022-05-20 16:06:48 +02:00
Son 07f5267c5a move api keys page to header 2022-05-20 16:06:30 +02:00
Son 11e0cbfe9c tweak the account activated page ui 2022-05-20 15:35:57 +02:00
Son Nguyen Kim cfa46e18fc
Merge pull request #1009 from simple-login/ui-tweak
tweak the UI for onboarding page: use svg instead of png, css change
2022-05-20 15:17:58 +02:00
Son Nguyen Kim c87e503701
Merge pull request #1004 from simple-login/feature/add-new-page-for-account-activated
Add new page for account activated
2022-05-20 15:16:21 +02:00
Son 47246d15cf tweak the UI for onboarding page: use svg instead of png, css change 2022-05-20 09:53:11 +02:00
Carlos Quintana e5770de329
Add account_activated page prompting user to install the extension 2022-05-20 09:40:03 +02:00
Son Nguyen Kim 0e3be23acc
Merge pull request #997 from simple-login/feature/adapt-extension-setup
Adapt extension setup
2022-05-20 09:01:35 +02:00
Carlos Quintana 6e905f769d
Limit the amount of "PERFORM_EXTENSION_SETUP" messages to be sent 2022-05-20 08:53:45 +02:00
Carlos Quintana 39b5fa50d8
Use is_authenticated 2022-05-20 08:48:01 +02:00
Carlos Quintana e4d6f1f117
Use setInterval instead of setTimeout on the extension 2022-05-19 11:51:18 +02:00
Carlos Quintana a73a15d628
Show extension version information on final onboarding screen 2022-05-19 11:47:41 +02:00
Carlos Quintana e6acff13e5
Send extension setup message if user is logged in 2022-05-19 11:47:22 +02:00
Son 8ca4daf894 remove the drag and drop mention for now 2022-05-18 18:29:56 +02:00
Carlos Quintana c01db463f7
Hide onboarding contents for a while 2022-05-18 09:22:10 +02:00
Carlos Quintana d3f4602bb7
Send the EXTENSION_SETUP message on /onboarding too 2022-05-17 16:51:08 +02:00
Carlos Quintana 8ac87217d2
Adapt extension setup 2022-05-17 12:22:38 +02:00
Son Nguyen Kim 4a4d4a5717
Merge pull request #993 from simple-login/update-wording-email
update the email wording
2022-05-16 14:48:35 +02:00
Son 345b3ea4f0 update wording 2022-05-16 14:47:56 +02:00
Adrià Casajús 2adcbf52be
Merge pull request #963 from simple-login/ac-complaints
Handle complaints that have multiple recipients
2022-05-16 10:30:14 +02:00
Son Nguyen Kim f0263b812e
Merge pull request #986 from simple-login/feature/add-extension-onboarding-pages
Add extension onboarding pages
2022-05-16 09:12:52 +02:00
Carlos Quintana 5fc8245b8b
Remove link to support from test email 2022-05-16 08:27:23 +02:00
Son f89967f585 update the email wording 2022-05-15 19:51:47 +02:00
Adrià Casajús 34ad81c7c0
Merge pull request #921 from simple-login/ac-free-no-reverse-alias
Prevent free users from creating reverse-alias
2022-05-13 17:13:48 +02:00
Adrià Casajús 3a48b30f30
Fix: Sanitize directory name before displaying it to the user 2022-05-13 16:55:45 +02:00
Carlos Quintana a0bcb33bd1
Add Or right click to extension onboarding page 2022-05-13 16:13:15 +02:00
Carlos Quintana 2bab0e3e7c
Add Click on the icon to create an alias 2022-05-13 15:05:30 +02:00
Adrià Casajús 7235de8e73
HTML formatting 2022-05-13 13:02:26 +02:00
Carlos Quintana bc48ec0e9f
Add footer for onboarding extension page 2022-05-13 12:17:02 +02:00
Carlos Quintana 2e62a9f00c
Remove support email from test email 2022-05-13 12:16:55 +02:00
Carlos Quintana bef71b7be3
Update contact instructions on test_email 2022-05-13 10:55:13 +02:00
Carlos Quintana 933237e73b
Implement "Send me an email" button on final extension onboarding 2022-05-13 08:53:31 +02:00
Carlos Quintana 710f4d0709
Start adding extension onboarding pages 2022-05-13 08:21:35 +02:00
Adrià Casajús 0c896100a4
Update html 2022-05-12 18:46:42 +02:00
Adrià Casajús 5dde39eb37
Prevent free users from creating reverse-alias 2022-05-12 13:20:05 +02:00
Son f3b41279a9 simplify template 2022-05-11 19:12:52 +02:00
Son 7d591baea5 handle case user doesn't have default domain for alias
when user doesn't have default domain for alias, display "Not Selected" to avoid confusion
2022-05-11 19:10:02 +02:00
Adrià Casajús 48554369bd
Get the mailbox if possible from the email log 2022-05-10 23:34:57 +02:00
Carlos Quintana 5b60ef1e35
Preserve next_url in oauth login 2022-05-09 12:20:14 +02:00
Carlos Quintana 8d4683e59e
Add login with proton 2022-05-05 12:20:55 +02:00
Son Nguyen Kim beea14ef14
Update provider-complaint-reply-phase.txt.jinja2 2022-05-02 16:41:37 +02:00
Adrià Casajús e62022f032
Merge remote-tracking branch 'origin/master' into ac-store-contact-bounces
* origin/master: (29 commits)
  PR comments
  support "enabled" param in /api/v2/aliases
  Update PGPy to 0.5.4 to allow for python 3.10
  Also install libpq-dev
  Fix python 3.10
  Add methods to check if alias will be auto-created
  PR comments
  Allow sending messages in a background thread
  Use the proper import for newrelic agent
  not send emails to inform about an alias can't be created to disabled user
  prevent disabled user from using the api
  make sure disabled user can't create new alias
  Put version version between " so it is 3.10 instead of 3.1
  Add workflow for python 3.10
  Remove it for all creds
  Do not send the transports to the js part since we have not stored them previously
  move help to menu on small screen
  only show the help button on desktop
  use another logo for mobile
  add new parameter disabled in /GET /api/v2/aliases
  ...
2022-04-29 15:56:09 +02:00
Son d1447e293d move help to menu on small screen 2022-04-26 15:47:25 +02:00
Son e01eff8755 only show the help button on desktop 2022-04-26 13:01:12 +02:00
Son f6320d5321 use another logo for mobile 2022-04-26 13:00:57 +02:00
Adrià Casajús 5208c549fa
Rename TransactionalComplaint to ProviderComplaint 2022-04-25 14:40:42 +02:00
Adrià Casajús c573ef655e
Store bounces in the reply phase to prevent abuse 2022-04-21 11:23:58 +02:00
Son 1709de93ef add link to the anti phishing page 2022-04-14 09:28:26 +02:00
Son 95770de4d5 improve email wording 2022-04-14 09:23:49 +02:00
Adrià Casajús 8df6d98522
Merge remote-tracking branch 'origin/master' into ac-dmarc-reply-phase 2022-04-08 11:34:12 +02:00
Son d26fc6ecf0 update email wording 2022-04-08 11:10:43 +02:00
Adrià Casajús 8ca1be0166
Apply dmarc policy to the reply phase 2022-04-06 12:51:04 +02:00
Son 43a6c87fd6 format some html files using pycharm 2022-04-02 17:36:33 +07:00
Son 0d7d56c0ea send email when an email is put to quarantine 2022-03-25 18:02:17 +01:00
Son e11c257571 improve notification for quarantine 2022-03-22 18:54:36 +01:00
Son Nguyen Kim 99b05034b0
Merge pull request #843 from acasajus/new/parse-rpamd-headers
Parse rspamd headers and apply dmarc policy if found.
2022-03-22 17:13:11 +01:00
Adrià Casajús 51b479c64f
Fix transactional emails 2022-03-22 12:23:16 +01:00
Adrià Casajús 1b2d504b3b
Send a notification to the user when a message has been quarantined 2022-03-21 18:33:18 +01:00
Son Nguyen Kim 9807d32159
Merge pull request #834 from simple-login/feature/improve-notif
Improve notification
2022-03-10 08:34:29 +01:00
Son e0b5bd36a6 show "more" only when a notification has a title. Show either title or message. Use bold font when a notification isn't read 2022-03-09 17:59:42 +01:00
Son fb00c18d5a create a notification when an alias is disabled 2022-03-09 17:59:02 +01:00
Son Nguyen Kim aa5c86605a
Merge pull request #833 from acasajus/new/outbound-tracking
Use plausible outbound link tracking
2022-03-09 10:36:01 +01:00
Adrià Casajús b35b13b764
Use plausible outbound link tracking 2022-03-09 09:45:09 +01:00
Son Nguyen Kim 6a520e110c
Merge pull request #816 from simple-login/feature/include-sender-in-header
Feature/include sender in header
2022-02-28 09:24:18 +01:00
Son 4faf0d7636 optimize dashboard page: load custom domain using joinedload() instead of explicit join 2022-02-26 17:34:53 +01:00
Son fa95f4273d ui tweak 2022-02-26 16:12:44 +01:00
Son 9c67aad34d remove "reply to this email" 2022-02-26 15:29:33 +01:00
Adrià Casajús 61d1655529
Move all js to a source file 2022-02-25 14:58:38 +01:00
Son 007aa56551 user can turn on/off the including sender in header option 2022-02-25 12:24:54 +01:00
Adrià Casajús 3d498b4eae
Allow drag and drop of keys into the text area 2022-02-24 18:28:30 +01:00
Son 8fc5fd6d16 improve wording 2022-02-21 16:01:46 +01:00
Son Nguyen Kim 7d008228e3
Merge pull request #811 from cquintana92/feature/ignore-or-reject-for-blocked-contacts
Allow to configure ignore or reject response for blocked contacts
2022-02-21 15:55:48 +01:00
Son f8640bfc91 change subscription cancel email 2022-02-21 15:10:22 +01:00