Merge branch 'release/2.2.0' into develop

3 files changed, 34 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d96b64e40..92ad4344b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
-## v2.2.0-rc.1
+## v2.2.0
+
+**Since v2.1.0**
 
 ## IMPORTANT NOTES
 
@@ -163,6 +165,33 @@
  * Fix playlist creation/update with a long description
  * Fix links of same instance in video description
  * Fix REPL script
+ * Fix broken client when cookies are disabled
+ * Fix upload button color in dark mode
+ * Explicit theme colors for inputs and textarea
+ * Fix input/textarea themes
+ * Fix action button icons theme
+ * Fix grey color theme
+ * Fix regression scrollbar bgcolor mdtextarea maximized-mode ([@kimsible](https://github.com/kimsible))
+
+
+**since v2.2.0-rc.1**
+
+### Bug fixes
+
+ * Fix broken migration introduced in 2.2.0-rc.1 in docker
+ * Fix sort icons in tables
+ * Fix action button overflow in tables
+ * Fix broken client when cookies are disabled
+ * Fix upload button color in dark mode
+ * Explicit theme colors for inputs and textarea
+ * Fix input/textarea themes
+ * Fix dropdown menu overflow
+ * Fix notifications with dark theme
+ * Fix action button icons theme
+ * Fix grey color theme
+ * Fix regression scrollbar bgcolor mdtextarea maximized-mode ([@kimsible](https://github.com/kimsible))
+ * Fix broken emails
+
 
 
 ## v2.1.1
diff --git a/scripts/build/server.sh b/scripts/build/server.sh
index 2ec83a3e1..b903f8250 100755
--- a/scripts/build/server.sh
+++ b/scripts/build/server.sh
@@ -7,3 +7,4 @@ rm -rf ./dist
 npm run tsc
 cp "./tsconfig.json" "./dist"
 cp -r "./server/static" "./server/assets" "./dist/server"
+cp -r "./server/lib/emails" "./dist/server/lib"
diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index 935c9e882..04aade83a 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -473,7 +473,7 @@ class Emailer {
       },
       transport: this.transporter,
       views: {
-        root: join(root(), 'server', 'lib', 'emails')
+        root: join(root(), 'dist', 'server', 'lib', 'emails')
       },
       subjectPrefix: CONFIG.EMAIL.SUBJECT.PREFIX
     })
@@ -498,8 +498,8 @@ class Emailer {
           },
           options // overriden/new variables given for a specific template in the payload
         ) as SendEmailOptions)
-        .then(logger.info)
-        .catch(logger.error)
+        .then(res => logger.debug('Sent email.', { res }))
+        .catch(err => logger.error('Error in email sender.', { err }))
     }
   }