aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel GarcĂ­a <[email protected]>2020-05-31 00:22:58 +0200
committerGitHub <[email protected]>2020-05-31 00:22:58 +0200
commit0bdeb02a3146b41440de9f352dab9fdfa33e5b97 (patch)
tree62772bf0f65718bab184038ace3715f307d0b3dc
parentb03698fadbbdefdccf63b8ea71eadf7dc19e7da8 (diff)
parenta447e4e7efba3089525dad45d8ee9f7fe2a2b1dc (diff)
downloadvaultwarden-0bdeb02a3146b41440de9f352dab9fdfa33e5b97.tar.gz
vaultwarden-0bdeb02a3146b41440de9f352dab9fdfa33e5b97.zip
Merge pull request #1009 from jjlin/email-subject
Don't HTML-escape email subject lines
-rw-r--r--src/static/templates/email/invite_accepted.hbs2
-rw-r--r--src/static/templates/email/invite_accepted.html.hbs2
-rw-r--r--src/static/templates/email/invite_confirmed.hbs2
-rw-r--r--src/static/templates/email/invite_confirmed.html.hbs2
-rw-r--r--src/static/templates/email/new_device_logged_in.hbs2
-rw-r--r--src/static/templates/email/new_device_logged_in.html.hbs2
-rw-r--r--src/static/templates/email/send_org_invite.hbs2
-rw-r--r--src/static/templates/email/send_org_invite.html.hbs2
8 files changed, 8 insertions, 8 deletions
diff --git a/src/static/templates/email/invite_accepted.hbs b/src/static/templates/email/invite_accepted.hbs
index 4bb1af3f..bdb7afcb 100644
--- a/src/static/templates/email/invite_accepted.hbs
+++ b/src/static/templates/email/invite_accepted.hbs
@@ -1,4 +1,4 @@
-Invitation accepted
+Invitation to {{{org_name}}} accepted
<!---------------->
<html>
<p>
diff --git a/src/static/templates/email/invite_accepted.html.hbs b/src/static/templates/email/invite_accepted.html.hbs
index 4466da0d..32c0f468 100644
--- a/src/static/templates/email/invite_accepted.html.hbs
+++ b/src/static/templates/email/invite_accepted.html.hbs
@@ -1,4 +1,4 @@
-Invitation accepted
+Invitation to {{{org_name}}} accepted
<!---------------->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
<head>
diff --git a/src/static/templates/email/invite_confirmed.hbs b/src/static/templates/email/invite_confirmed.hbs
index 63cc5450..acfbf972 100644
--- a/src/static/templates/email/invite_confirmed.hbs
+++ b/src/static/templates/email/invite_confirmed.hbs
@@ -1,4 +1,4 @@
-Invitation to {{org_name}} confirmed
+Invitation to {{{org_name}}} confirmed
<!---------------->
<html>
<p>
diff --git a/src/static/templates/email/invite_confirmed.html.hbs b/src/static/templates/email/invite_confirmed.html.hbs
index 7a78af0c..3f07a74c 100644
--- a/src/static/templates/email/invite_confirmed.html.hbs
+++ b/src/static/templates/email/invite_confirmed.html.hbs
@@ -1,4 +1,4 @@
-Invitation to {{org_name}} confirmed
+Invitation to {{{org_name}}} confirmed
<!---------------->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
<head>
diff --git a/src/static/templates/email/new_device_logged_in.hbs b/src/static/templates/email/new_device_logged_in.hbs
index 5cf63fa2..c3c6bf90 100644
--- a/src/static/templates/email/new_device_logged_in.hbs
+++ b/src/static/templates/email/new_device_logged_in.hbs
@@ -1,4 +1,4 @@
-New Device Logged In From {{device}}
+New Device Logged In From {{{device}}}
<!---------------->
<html>
<p>
diff --git a/src/static/templates/email/new_device_logged_in.html.hbs b/src/static/templates/email/new_device_logged_in.html.hbs
index d13f3bcb..20d4eaa8 100644
--- a/src/static/templates/email/new_device_logged_in.html.hbs
+++ b/src/static/templates/email/new_device_logged_in.html.hbs
@@ -1,4 +1,4 @@
-New Device Logged In From {{device}}
+New Device Logged In From {{{device}}}
<!---------------->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
<head>
diff --git a/src/static/templates/email/send_org_invite.hbs b/src/static/templates/email/send_org_invite.hbs
index be4a443d..340820b9 100644
--- a/src/static/templates/email/send_org_invite.hbs
+++ b/src/static/templates/email/send_org_invite.hbs
@@ -1,4 +1,4 @@
-Join {{org_name}}
+Join {{{org_name}}}
<!---------------->
<html>
<p>
diff --git a/src/static/templates/email/send_org_invite.html.hbs b/src/static/templates/email/send_org_invite.html.hbs
index 0809262f..3326e852 100644
--- a/src/static/templates/email/send_org_invite.html.hbs
+++ b/src/static/templates/email/send_org_invite.html.hbs
@@ -1,4 +1,4 @@
-Join {{org_name}}
+Join {{{org_name}}}
<!---------------->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
<head>