mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge branch 'master' into fonts

Browse source
This commit is contained in:
Nyanmisaka 2020-09-04 21:52:46 +08:00 • committed by GitHub
commit ab1799544c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
247 changed files with 4602 additions and 8723 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/controllers/dashboard/encodingsettings.js
View file

@ -50,7 +50,8 @@ import libraryMenu from 'libraryMenu';
data: JSON.stringify({
Path: form.querySelector('.txtEncoderPath').value,
PathType: 'Custom'
})
}),
contentType: 'application/json'
}).then(Dashboard.processServerConfigurationUpdateResult, onSaveEncodingPathFailure);
});
}
@ -132,7 +133,7 @@ import libraryMenu from 'libraryMenu';
name: globalize.translate('Transcoding')
}, {
href: 'playbackconfiguration.html',
name: globalize.translate('TabResumeSettings')
name: globalize.translate('ButtonResume')
}, {
href: 'streamingsettings.html',
name: globalize.translate('TabStreaming')