aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md4
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts2
-rw-r--r--package.json2
-rw-r--r--yarn.lock8
4 files changed, 8 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9acd4b116..7f0426a56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,10 +36,10 @@
36 * Add an intro at the beginning and/or an outro at the end of the video 36 * Add an intro at the beginning and/or an outro at the end of the video
37 * Add an icon/watermark in the top right corner of the video 37 * Add an icon/watermark in the top right corner of the video
38 * PeerTube will automatically transcode the new video and replace the original one 38 * PeerTube will automatically transcode the new video and replace the original one
39 * :tada: Add advanced video statistics :tada: 39 * :tada: Add advanced statistics of a specific video :tada:
40 * Provide *Average watch time*, *Total watch time* and *Peak viewers* video statistics 40 * Provide *Average watch time*, *Total watch time* and *Peak viewers* video statistics
41 * Display total viewers, aggregated watch time and audience retention in interactive time series graphs 41 * Display total viewers, aggregated watch time and audience retention in interactive time series graphs
42 * Display viewer countries in bar chart if enabled by admins 42 * Display viewer countries in bar chart if not disabled by admins
43 * :tada: Add latency setting support for lives (small latency without P2P or high latency to increase P2P ratio) :tada: 43 * :tada: Add latency setting support for lives (small latency without P2P or high latency to increase P2P ratio) :tada:
44 * :tada: Add ability to save a replay of every streaming session of a permanent live :tada: 44 * :tada: Add ability to save a replay of every streaming session of a permanent live :tada:
45 * Add simple subtitle edition from video captions tab in video edition form [#4666](https://github.com/Chocobozzz/PeerTube/pull/4666) 45 * Add simple subtitle edition from video captions tab in video edition form [#4666](https://github.com/Chocobozzz/PeerTube/pull/4666)
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
index 7cb3d8300..663955d27 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
@@ -136,7 +136,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
136 return this.refereshTokenAndRetryUpload() 136 return this.refereshTokenAndRetryUpload()
137 } 137 }
138 138
139 const error = state.response?.error || 'Unknow error' 139 const error = state.response?.error?.message || state.response?.error || 'Unknown error'
140 140
141 this.handleUploadError({ 141 this.handleUploadError({
142 error: new Error(error), 142 error: new Error(error),
diff --git a/package.json b/package.json
index 44f0a22d4..d9ff46f18 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
83 "@babel/parser": "7.17.8", 83 "@babel/parser": "7.17.8",
84 "@peertube/feed": "^5.0.1", 84 "@peertube/feed": "^5.0.1",
85 "@peertube/http-signature": "^1.6.0", 85 "@peertube/http-signature": "^1.6.0",
86 "@uploadx/core": "^5.1.0", 86 "@uploadx/core": "^5.1.2",
87 "async": "^3.0.1", 87 "async": "^3.0.1",
88 "async-lru": "^1.1.1", 88 "async-lru": "^1.1.1",
89 "bcrypt": "5.0.1", 89 "bcrypt": "5.0.1",
diff --git a/yarn.lock b/yarn.lock
index a3de03660..d09f7329c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2235,10 +2235,10 @@
2235 resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" 2235 resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
2236 integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== 2236 integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
2237 2237
2238"@uploadx/core@^5.1.0": 2238"@uploadx/core@^5.1.2":
2239 version "5.1.0" 2239 version "5.1.2"
2240 resolved "https://registry.yarnpkg.com/@uploadx/core/-/core-5.1.0.tgz#292d6f0c2a2e8f21283eed7879a73ee856334ac0" 2240 resolved "https://registry.yarnpkg.com/@uploadx/core/-/core-5.1.2.tgz#6e4dbfa586c58dd358765bdc5590536c2ba26267"
2241 integrity sha512-C19Hne2X7PaaJ8J8clj0XE+iAqAtIx/8DnsSMMe8LWtIcGnquRsj5acaawuhOr7SrYOpI1CHCY5HC4SPtykb7g== 2241 integrity sha512-/91wxm4g/Cn0/AcFN96MOWUaQzSQ8rPv2ObHhmHrl5sId2DJqnUiY2Ll4Xkw+WDzuHNF3V9yVwSh53eR1TUDpQ==
2242 dependencies: 2242 dependencies:
2243 bytes "^3.1.0" 2243 bytes "^3.1.0"
2244 debug "^4.3.1" 2244 debug "^4.3.1"