+
+
+
+
+ |
+
|
@@ -168,32 +248,64 @@
+
+
+
+
+
+
+
+
+
+ |
+
diff --git a/backend/src/email/reset-password.template.html b/backend/src/email/reset-password.template.html
index 42da5e1ac..436e0ff41 100644
--- a/backend/src/email/reset-password.template.html
+++ b/backend/src/email/reset-password.template.html
@@ -143,7 +143,7 @@ |
@@ -171,6 +171,109 @@
+
+ |
+
+ |
+
+
+ |
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
|
@@ -179,32 +282,64 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/backend/src/email/self-hosted.template.html b/backend/src/email/self-hosted.template.html
index 0d0c7039b..3c7e71478 100644
--- a/backend/src/email/self-hosted.template.html
+++ b/backend/src/email/self-hosted.template.html
@@ -377,43 +377,6 @@
-
-
- |
-
- |
-
-
- |
|
diff --git a/backend/src/email/sendgrid-sender.ts b/backend/src/email/sendgrid-sender.ts
index 56486b90d..e905f8e2c 100644
--- a/backend/src/email/sendgrid-sender.ts
+++ b/backend/src/email/sendgrid-sender.ts
@@ -16,6 +16,12 @@ export const sendGridSender: EmailSender = async function (
from: config.SENDGRID_SENDER,
html: body,
subject,
+ trackingSettings: {
+ subscriptionTracking: {
+ enable: true,
+ substitutionTag: '[Unsubscribe]',
+ },
+ },
};
try {
await sendGrid.send(msg);
diff --git a/frontend/src/state/columns.ts b/frontend/src/state/columns.ts
index ddfbc15f4..6ec139d33 100644
--- a/frontend/src/state/columns.ts
+++ b/frontend/src/state/columns.ts
@@ -108,7 +108,7 @@ export const getTemplateColumnByType =
},
{
color: '#FFEBEE',
- icon: 'unamused',
+ icon: 'mortar_board',
label: translations.PostBoard.learnedQuestion,
type: 'learned',
},
diff --git a/frontend/src/views/session-editor/sections/template/IconPicker.tsx b/frontend/src/views/session-editor/sections/template/IconPicker.tsx
index 28ca52a76..fbf4fdf1d 100644
--- a/frontend/src/views/session-editor/sections/template/IconPicker.tsx
+++ b/frontend/src/views/session-editor/sections/template/IconPicker.tsx
@@ -15,8 +15,8 @@ const IconPicker = ({ value, onChange }: IconPickerProps) => {
const [opened, open, close] = useModal();
const handleChange = useCallback(
(emoji: EmojiData) => {
- if (emoji.id) {
- onChange(emoji.id);
+ if (emoji.colons) {
+ onChange(emoji.colons);
close();
}
},
| | |
