Merge pull request #387 from jellyfin/release-10.3.z

Backmerge for Release 10.3.4, 10.3.5, and 10.3.6

CONTRIBUTORS.md

@@ -23,6 +23,8 @@
  - [thornbill](https://github.com/thornbill)
  - [redSpoutnik](https://github.com/redSpoutnik)
  - [DrPandemic](https://github.com/drpandemic)
+ - [Oddstr13](https://github.com/oddstr13)
+ - [petermcneil](https://github.com/petermcneil)
 
 # Emby Contributors
 

src/bower_components/apiclient/credentialprovider.js

@@ -13,7 +13,7 @@ define(["events", "appStorage"], function(events, appStorage) {
     }
 
     function Credentials(key) {
-        this.key = key || "servercredentials3"
+        this.key = key || "jellyfin_credentials"
     }
     return Credentials.prototype.clear = function() {
         this._credentials = null, appStorage.removeItem(this.key)

src/components/channelmapper/channelmapper.js

@@ -28,15 +28,18 @@ define(["dialogHelper", "loading", "connectionManager", "globalize", "actionshee
         function onChannelsElementClick(e) {
             var btnMap = parentWithClass(e.target, "btnMap");
             if (btnMap) {
-                var channelId = btnMap.getAttribute("data-id"),
+                var channelId = btnMap.getAttribute("data-id");
-                    providerChannelId = btnMap.getAttribute("data-providerid"),
+                var providerChannelId = btnMap.getAttribute("data-providerid");
-                    menuItems = currentMappingOptions.ProviderChannels.map(function(m) {
+                var menuItems = currentMappingOptions.ProviderChannels.map(function(m) {
-                        return {
+                    return {
-                            name: m.Name,
+                        name: m.Name,
-                            id: m.Id,
+                        id: m.Id,
-                            selected: m.Id.toLowerCase() === providerChannelId.toLowerCase()
+                        selected: m.Id.toLowerCase() === providerChannelId.toLowerCase()
-                        }
+                    }
-                    });
+                }).sort(function (a, b) {
+                    return a.name.localeCompare(b.name);
+                });
+
                 actionsheet.show({
                     positionTo: btnMap,
                     items: menuItems
@@ -93,4 +96,4 @@ define(["dialogHelper", "loading", "connectionManager", "globalize", "actionshee
             })
         }
     }
-});
+});

src/components/recordingcreator/recordingfields.js

@@ -194,7 +194,7 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
         var isChecked = !button.querySelector('i').classList.contains('recordingIcon-active');
 
         if (isChecked) {
-            context.querySelector('.recordSeriesContainer').classList.remove('hide');
+            options.parent.querySelector('.recordSeriesContainer').classList.remove('hide');
             if (!this.SeriesTimerId) {
                 var promise = this.TimerId ?
                     recordingHelper.changeRecordingToSeries(apiClient, this.TimerId, options.programId) :

src/manifest.json

@@ -4,7 +4,7 @@
     "description": "Jellyfin: the Free Software Media System.",
     "lang": "en-US",
     "short_name": "Jellyfin",
-    "start_url": "/web/index.html",
+    "start_url": "/web/index.html#!/home.html",
     "theme_color": "#101010",
     "background_color": "#101010",
     "display": "standalone",
@@ -28,8 +28,5 @@
             "src": "touchicon512.png",
             "type": "image/png"
         }
-    ],
+    ]
-    "related_applications": [{
-        "platform": "web"
-    }]
 }