Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into fix-accese

# Conflicts:
#	src/scripts/site.js

src/controllers/dashboard/encodingsettings.html

@@ -134,6 +134,7 @@
                             <option value="reinhard">Reinhard</option>
                             <option value="hable">Hable</option>
                             <option value="mobius">Mobius</option>
+                            <option value="bt2390">BT.2390</option>
                         </select>
                         <div class="fieldDescription">
                             <a is="emby-linkbutton" rel="noopener noreferrer" class="button-link" href="http://ffmpeg.org/ffmpeg-all.html#tonemap_005fopencl" target="_blank">${TonemappingAlgorithmHelp}</a>

src/controllers/dashboard/general.html

@@ -49,6 +49,19 @@
                     </div>
                 </div>
 
+                <div class="verticalSection">
+                    <div class="sectionTitleContainer flex align-items-center">
+                        <h2 class="sectionTitle">${QuickConnect}</h2>
+                    </div>
+                </div>
+
+                <div class="checkboxList paperList" style="padding:.5em 1em;">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkQuickConnectAvailable" />
+                        <span>${EnableQuickConnect}</span>
+                    </label>
+                </div>
+
                 <div class="verticalSection">
                     <h2>${HeaderBranding}</h2>
                     <div class="inputContainer">

src/controllers/dashboard/general.js

@@ -14,6 +14,7 @@ import alert from '../../components/alert';
     function loadPage(page, config, languageOptions, systemInfo) {
         page.querySelector('#txtServerName').value = systemInfo.ServerName;
         page.querySelector('#txtCachePath').value = systemInfo.CachePath || '';
+        page.querySelector('#chkQuickConnectAvailable').checked = config.QuickConnectAvailable === true;
         $('#txtMetadataPath', page).val(systemInfo.InternalMetadataPath || '');
         $('#txtMetadataNetworkPath', page).val(systemInfo.MetadataNetworkPath || '');
         $('#selectLocalizationLanguage', page).html(languageOptions.map(function (language) {
@@ -33,6 +34,7 @@ import alert from '../../components/alert';
             config.CachePath = form.querySelector('#txtCachePath').value;
             config.MetadataPath = $('#txtMetadataPath', form).val();
             config.MetadataNetworkPath = $('#txtMetadataNetworkPath', form).val();
+            config.QuickConnectAvailable = form.querySelector('#chkQuickConnectAvailable').checked;
             ApiClient.updateServerConfiguration(config).then(function() {
                 ApiClient.getNamedConfiguration(brandingConfigKey).then(function(brandingConfig) {
                     brandingConfig.LoginDisclaimer = form.querySelector('#txtLoginDisclaimer').value;

src/controllers/dashboard/logs.html

@@ -1,6 +1,31 @@
 <div id="logPage" data-role="page" class="page type-interior">
     <div>
         <div class="content-primary">
+            <form class="logsForm">
+                <div class="verticalSection">
+                    <div class="sectionTitleContainer flex align-items-center">
+                        <h2 class="sectionTitle">${TabLogs}</h2>
+                    </div>
+                </div>
+
+                <div class="verticalSection">
+                    <div class="checkboxContainer checkboxContainer-withDescription">
+                        <label>
+                            <input type="checkbox" is="emby-checkbox" id="chkSlowResponseWarning" />
+                            <span>${LabelSlowResponseEnabled}</span>
+                        </label>
+                    </div>
+                    <div class="inputContainer">
+                        <input is="emby-input" type="number" id="txtSlowResponseWarning" label="${LabelSlowResponseTime}" />
+                    </div>
+                </div>
+                <br />
+                <div>
+                    <button is="emby-button" type="submit" class="raised button-submit block">
+                        <span>${Save}</span>
+                    </button>
+                </div>
+            </form>
             <div class="serverLogs readOnlyContent">
             </div>
         </div>

src/controllers/dashboard/logs.js

@@ -1,12 +1,32 @@
 import datetime from '../../scripts/datetime';
 import loading from '../../components/loading/loading';
+import globalize from '../../scripts/globalize';
 import '../../elements/emby-button/emby-button';
 import '../../components/listview/listview.scss';
 import '../../assets/css/flexstyles.scss';
+import Dashboard from '../../scripts/clientUtils';
+import alert from '../../components/alert';
 
 /* eslint-disable indent */
 
+    function onSubmit() {
+        loading.show();
+        const form = this;
+        ApiClient.getServerConfiguration().then(function (config) {
+            config.EnableSlowResponseWarning = form.querySelector('#chkSlowResponseWarning').checked;
+            config.SlowResponseThresholdMs = form.querySelector('#txtSlowResponseWarning').value;
+            ApiClient.updateServerConfiguration(config).then(function() {
+                Dashboard.processServerConfigurationUpdateResult();
+            }, function () {
+                alert(globalize.translate('ErrorDefault'));
+                Dashboard.processServerConfigurationUpdateResult();
+            });
+        });
+        return false;
+    }
+
     export default function(view) {
+        view.querySelector('.logsForm').addEventListener('submit', onSubmit);
         view.addEventListener('viewbeforeshow', function() {
             loading.show();
             const apiClient = ApiClient;
@@ -32,8 +52,14 @@ import '../../assets/css/flexstyles.scss';
                 }).join('');
                 html += '</div>';
                 view.querySelector('.serverLogs').innerHTML = html;
-                loading.hide();
             });
+
+            apiClient.getServerConfiguration().then(function (config) {
+                view.querySelector('#chkSlowResponseWarning').checked = config.EnableSlowResponseWarning;
+                view.querySelector('#txtSlowResponseWarning').value = config.SlowResponseThresholdMs;
+            });
+
+            loading.hide();
         });
     }
 

src/controllers/dashboard/plugins/add/index.js

@@ -1,4 +1,6 @@
 import 'jquery';
+import marked from 'marked';
+import DOMPurify from 'dompurify';
 import loading from '../../../../components/loading/loading';
 import globalize from '../../../../scripts/globalize';
 import '../../../../elements/emby-button/emby-button';
@@ -13,7 +15,7 @@ function populateHistory(packageInfo, page) {
     for (let i = 0; i < length; i++) {
         const version = packageInfo.versions[i];
         html += '<h2 style="margin:.5em 0;">' + version.version + '</h2>';
-        html += '<div style="margin-bottom:1.5em;">' + version.changelog + '</div>';
+        html += '<div style="margin-bottom:1.5em;">' + DOMPurify.sanitize(marked(version.changelog)) + '</div>';
     }
 
     $('#revisionHistory', page).html(html);

src/controllers/dashboard/quickConnect.html

@@ -1,24 +0,0 @@
-<div id="quickConnectPage" data-role="page" class="page type-interior advancedConfigurationPage">
-    <div class="content-primary">
-        <form class="quickConnectSettings">
-            <div class="verticalSection">
-                <div class="sectionTitleContainer flex align-items-center">
-                    <h2 class="sectionTitle">${QuickConnect}</h2>
-                </div>
-            </div>
-
-            <div>${LabelCurrentStatus}<span id="quickConnectStatus" style="padding:0 0.4em;"></span></div>
-
-            <div class="checkboxList paperList" style="padding:.5em 1em;">
-                <label>
-                    <input type="checkbox" is="emby-checkbox" id="chkQuickConnectAvailable" />
-                    <span>${EnableQuickConnect}</span>
-                </label>
-            </div>
-
-            <button is="emby-button" id="btnQuickConnectSubmit" type="submit" class="raised button-submit block">
-                <span>${Save}</span>
-            </button>
-        </form>
-    </div>
-</div>

src/controllers/dashboard/quickConnect.js

@@ -1,58 +0,0 @@
-import loading from '../../components/loading/loading';
-import toast from '../../components/toast/toast';
-import globalize from '../../scripts/globalize';
-
-const unavailable = 'Unavailable';
-const available = 'Available';
-const active = 'Active';
-let page;
-
-export default function(view) {
-    view.addEventListener('viewshow', function () {
-        page = this;
-        loading.show();
-        page.querySelector('#btnQuickConnectSubmit').onclick = onSubmit;
-        updatePage();
-    });
-}
-
-function loadPage(status) {
-    const check = status === available || status === active;
-
-    page.querySelector('#quickConnectStatus').textContent = status.toLocaleLowerCase();
-    page.querySelector('#chkQuickConnectAvailable').checked = check;
-
-    loading.hide();
-}
-
-function onSubmit() {
-    loading.show();
-
-    const newStatus = page.querySelector('#chkQuickConnectAvailable').checked ? available : unavailable;
-
-    const url = ApiClient.getUrl('/QuickConnect/Available?Status=' + newStatus);
-
-    ApiClient.ajax({
-        type: 'POST',
-        url: url
-    }, true).then(() => {
-        toast(globalize.translate('SettingsSaved'));
-        setTimeout(updatePage, 500);
-
-        return true;
-    }).catch((e) => {
-        console.error('Unable to set quick connect status. error:', e);
-    });
-
-    loading.hide();
-    return false;
-}
-
-function updatePage() {
-    ApiClient.getQuickConnect('Status').then((response) => {
-        loadPage(response);
-        return true;
-    }).catch((e) => {
-        console.error('Unable to get quick connect status. error:', e);
-    });
-}