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 deinterlace-improvements

Browse source
This commit is contained in:
Orry Verducci 2020-09-03 22:01:22 +01:00 • committed by GitHub
commit 5f96b19772
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
280 changed files with 8207 additions and 13009 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,10 +46,11 @@ import libraryMenu from 'libraryMenu';
return ApiClient.ajax({
url: ApiClient.getUrl('System/MediaEncoder/Path'),
type: 'POST',
data: {
data: JSON.stringify({
Path: form.querySelector('.txtEncoderPath').value,
PathType: 'Custom'
}
}),
contentType: 'application/json'
}).then(Dashboard.processServerConfigurationUpdateResult, onSaveEncodingPathFailure);
});
}
@ -130,7 +131,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')