aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-06-02 09:31:30 +0200
committerChocobozzz <me@florianbigard.com>2020-06-02 09:31:30 +0200
commitb763f88dd0f455ce0ccae9cb81182c985a47c101 (patch)
tree56f95f165795b782832609d53b41098a7b651a99
parentcdd8f7790c759664fe4d0962efa550cf1a8e37eb (diff)
parentf3e887e5f0f5669d09ca6fad13f3a39095d4b2f0 (diff)
downloadPeerTube-b763f88dd0f455ce0ccae9cb81182c985a47c101.tar.gz
PeerTube-b763f88dd0f455ce0ccae9cb81182c985a47c101.tar.zst
PeerTube-b763f88dd0f455ce0ccae9cb81182c985a47c101.zip
Merge branch 'release/2.2.0' into develop
-rw-r--r--CHANGELOG.md31
-rwxr-xr-xscripts/build/server.sh1
-rw-r--r--server/lib/emailer.ts6
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 @@
1# Changelog 1# Changelog
2 2
3## v2.2.0-rc.1 3## v2.2.0
4
5**Since v2.1.0**
4 6
5## IMPORTANT NOTES 7## IMPORTANT NOTES
6 8
@@ -163,6 +165,33 @@
163 * Fix playlist creation/update with a long description 165 * Fix playlist creation/update with a long description
164 * Fix links of same instance in video description 166 * Fix links of same instance in video description
165 * Fix REPL script 167 * Fix REPL script
168 * Fix broken client when cookies are disabled
169 * Fix upload button color in dark mode
170 * Explicit theme colors for inputs and textarea
171 * Fix input/textarea themes
172 * Fix action button icons theme
173 * Fix grey color theme
174 * Fix regression scrollbar bgcolor mdtextarea maximized-mode ([@kimsible](https://github.com/kimsible))
175
176
177**since v2.2.0-rc.1**
178
179### Bug fixes
180
181 * Fix broken migration introduced in 2.2.0-rc.1 in docker
182 * Fix sort icons in tables
183 * Fix action button overflow in tables
184 * Fix broken client when cookies are disabled
185 * Fix upload button color in dark mode
186 * Explicit theme colors for inputs and textarea
187 * Fix input/textarea themes
188 * Fix dropdown menu overflow
189 * Fix notifications with dark theme
190 * Fix action button icons theme
191 * Fix grey color theme
192 * Fix regression scrollbar bgcolor mdtextarea maximized-mode ([@kimsible](https://github.com/kimsible))
193 * Fix broken emails
194
166 195
167 196
168## v2.1.1 197## 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
7npm run tsc 7npm run tsc
8cp "./tsconfig.json" "./dist" 8cp "./tsconfig.json" "./dist"
9cp -r "./server/static" "./server/assets" "./dist/server" 9cp -r "./server/static" "./server/assets" "./dist/server"
10cp -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 {
473 }, 473 },
474 transport: this.transporter, 474 transport: this.transporter,
475 views: { 475 views: {
476 root: join(root(), 'server', 'lib', 'emails') 476 root: join(root(), 'dist', 'server', 'lib', 'emails')
477 }, 477 },
478 subjectPrefix: CONFIG.EMAIL.SUBJECT.PREFIX 478 subjectPrefix: CONFIG.EMAIL.SUBJECT.PREFIX
479 }) 479 })
@@ -498,8 +498,8 @@ class Emailer {
498 }, 498 },
499 options // overriden/new variables given for a specific template in the payload 499 options // overriden/new variables given for a specific template in the payload
500 ) as SendEmailOptions) 500 ) as SendEmailOptions)
501 .then(logger.info) 501 .then(res => logger.debug('Sent email.', { res }))
502 .catch(logger.error) 502 .catch(err => logger.error('Error in email sender.', { err }))
503 } 503 }
504 } 504 }
505 505