OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix notification overflow

pull/1902/head
Chocobozzz 2019-06-12 17:33:29 +02:00
parent 00aa1f0d9b
commit db714ab48a
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/app/shared/users/user-notifications.component.scss
View File

@ -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);

3
server/tests/api/check-params/config.ts
View File

@ -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

5
server/tests/api/server/config.ts
View File

@ -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

3
shared/extra-utils/server/config.ts
View File

@ -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