From 8651d4bd00970920856950568adebb4bb157e149 Mon Sep 17 00:00:00 2001 From: artiume Date: Sun, 1 Mar 2020 20:59:42 -0500 Subject: [PATCH 001/208] Update playback warning --- src/components/playback/experimentalwarnings.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/playback/experimentalwarnings.js b/src/components/playback/experimentalwarnings.js index 2d1ef53c19..9c0714e57e 100644 --- a/src/components/playback/experimentalwarnings.js +++ b/src/components/playback/experimentalwarnings.js @@ -46,21 +46,21 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function ( function showBlurayMessage() { var message = - 'Playback of Bluray folders in this app is experimental. Some titles may not work at all. For a better experience, consider converting to mkv video files, or use an Jellyfin app with native Bluray folder support.'; + 'Playback of Bluray folders in this app is experimental. Jellyfin cannot decrypt DRM. The current behavior is to play all files in series, this can include a two minute black intro video.'; return showMessage(message, 'blurayexpirementalinfo', 'nativeblurayplayback'); } function showDvdMessage() { var message = - 'Playback of Dvd folders in this app is experimental. Some titles may not work at all. For a better experience, consider converting to mkv video files, or use an Jellyfin app with native Dvd folder support.'; + 'Playback of Dvd folders in this app is experimental. Jellyfin cannot decrypt DRM. The current behavior is to play all files in series, this can include a two minute black intro video.'; return showMessage(message, 'dvdexpirementalinfo', 'nativedvdplayback'); } function showIsoMessage() { var message = - 'Playback of ISO files in this app is experimental. Some titles may not work at all. For a better experience, consider converting to mkv video files, or use an Jellyfin app with native ISO support.'; + 'Playback of ISO files in this app is experimental. The current behavior is to play all files in series, this can include a two minute black intro video.'; return showMessage(message, 'isoexpirementalinfo', 'nativeisoplayback'); } From 9f300bfb11d1973525fac38bc34c40f1588250ac Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Thu, 19 Mar 2020 23:06:19 +0100 Subject: [PATCH 002/208] Don't scale logo on details page --- src/assets/css/librarybrowser.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css index 67afef2376..22b9b6f5eb 100644 --- a/src/assets/css/librarybrowser.css +++ b/src/assets/css/librarybrowser.css @@ -614,8 +614,8 @@ position: absolute; top: 15vh; right: 0; - -webkit-background-size: contain; - background-size: contain; + -webkit-background-size: auto; + background-size: auto; } .noBackdrop .detailLogo { From b34a376691d2a0bea4a085bb1ebc30c94e1cefe5 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sat, 21 Mar 2020 00:26:55 +0100 Subject: [PATCH 003/208] Add library page size settings on movies --- src/components/displaysettings/displaysettings.js | 4 ++++ .../displaysettings/displaysettings.template.html | 5 +++++ src/controllers/movies/movies.js | 10 ++++++++-- src/scripts/settings/userSettingsBuilder.js | 13 +++++++++++++ src/strings/en-us.json | 2 ++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/components/displaysettings/displaysettings.js b/src/components/displaysettings/displaysettings.js index da407c11f1..47924f1370 100644 --- a/src/components/displaysettings/displaysettings.js +++ b/src/components/displaysettings/displaysettings.js @@ -186,6 +186,8 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', ' context.querySelector('#selectLanguage').value = userSettings.language() || ''; context.querySelector('.selectDateTimeLocale').value = userSettings.dateTimeLocale() || ''; + context.querySelector('#txtLibraryPageSize').value = userSettings.libraryPageSize() || 100; + selectDashboardTheme.value = userSettings.dashboardTheme() || ''; selectTheme.value = userSettings.theme() || ''; @@ -215,6 +217,8 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', ' userSettingsInstance.soundEffects(context.querySelector('.selectSoundEffects').value); userSettingsInstance.screensaver(context.querySelector('.selectScreensaver').value); + userSettingsInstance.libraryPageSize(context.querySelector('#txtLibraryPageSize').value); + userSettingsInstance.skin(context.querySelector('.selectSkin').value); userSettingsInstance.enableFastFadein(context.querySelector('#chkFadein').checked); diff --git a/src/components/displaysettings/displaysettings.template.html b/src/components/displaysettings/displaysettings.template.html index 16bbf0dd8a..9f89117f55 100644 --- a/src/components/displaysettings/displaysettings.template.html +++ b/src/components/displaysettings/displaysettings.template.html @@ -143,6 +143,11 @@ +
+ +
${LabelLibraryPageSizeHelp}
+
+