Fix notification overflow

diff --git a/client/src/app/shared/users/user-notifications.component.scss b/client/src/app/shared/users/user-notifications.component.scss
index 88f38d9cff671268327d4ad04021ccee254950b8..0c6c70d983dc9a1e3fb7dd93501d67e71e3dddee 100644 (file)
--- a/client/src/app/shared/users/user-notifications.component.scss
+++ b/client/src/app/shared/users/user-notifications.component.scss
@@ -14,6 +14,7 @@
   font-size: inherit;
   padding: 15px 5px 15px 10px;
   border-bottom: 1px solid $separator-border-color;
+  word-break: break-word;
 
   &.unread {
     background-color: rgba(0, 0, 0, 0.05);

diff --git a/server/tests/api/check-params/config.ts b/server/tests/api/check-params/config.ts
index 8155e11aba0d9a62ca7aabaa60c7d74910eb381c..a0d9392dc53af6e5b34e984867ef5c83d0fe4e54 100644 (file)
--- a/server/tests/api/check-params/config.ts
+++ b/server/tests/api/check-params/config.ts
@@ -66,7 +66,8 @@ describe('Test config API validators', function () {
         '360p': true,
         '480p': true,
         '720p': false,
-        '1080p': false
+        '1080p': false,
+        '2160p': false
       },
       hls: {
         enabled: false

diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts
index 8ea21158ad33212414293fb09a05259caabc2b12..c39516dee6d6253ade26217005bee00be1ebb7c8 100644 (file)
--- a/server/tests/api/server/config.ts
+++ b/server/tests/api/server/config.ts
@@ -59,6 +59,7 @@ function checkInitialConfig (server: ServerInfo, data: CustomConfig) {
   expect(data.transcoding.resolutions['480p']).to.be.true
   expect(data.transcoding.resolutions['720p']).to.be.true
   expect(data.transcoding.resolutions['1080p']).to.be.true
+  expect(data.transcoding.resolutions['2160p']).to.be.true
   expect(data.transcoding.hls.enabled).to.be.true
 
   expect(data.import.videos.http.enabled).to.be.true
@@ -109,6 +110,7 @@ function checkUpdatedConfig (data: CustomConfig) {
   expect(data.transcoding.resolutions['480p']).to.be.true
   expect(data.transcoding.resolutions['720p']).to.be.false
   expect(data.transcoding.resolutions['1080p']).to.be.false
+  expect(data.transcoding.resolutions['2160p']).to.be.false
   expect(data.transcoding.hls.enabled).to.be.false
 
   expect(data.import.videos.http.enabled).to.be.false
@@ -227,7 +229,8 @@ describe('Test config', function () {
           '360p': true,
           '480p': true,
           '720p': false,
-          '1080p': false
+          '1080p': false,
+          '2160p': false
         },
         hls: {
           enabled: false

diff --git a/shared/extra-utils/server/config.ts b/shared/extra-utils/server/config.ts
index a5f5989e099f7bc0cb0ef2c81e2d09f2eed624af..2b7965bc24a828b00816a1be88243948955926b3 100644 (file)
--- a/shared/extra-utils/server/config.ts
+++ b/shared/extra-utils/server/config.ts
@@ -98,7 +98,8 @@ function updateCustomSubConfig (url: string, token: string, newConfig: any) {
         '360p': true,
         '480p': true,
         '720p': false,
-        '1080p': false
+        '1080p': false,
+        '2160p': false
       },
       hls: {
         enabled: false