merge branch master into assets

src/controllers/dashboardpage.js

@@ -623,7 +623,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             }
         },
         getClientImage: function (connection) {
-            var iconUrl = imageHelper.getDeviceIcon(connection.DeviceName);
+            var iconUrl = imageHelper.getDeviceIcon(connection);
             return "<img src='" + iconUrl + "' />";
         },
         getNowPlayingImageUrl: function (item) {

src/controllers/devices.js

@@ -74,7 +74,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu
             deviceHtml += '<div class="cardScalable">';
             deviceHtml += '<div class="cardPadder cardPadder-backdrop"></div>';
             deviceHtml += '<a is="emby-linkbutton" href="' + (canEdit ? "device.html?id=" + device.Id : "#") + '" class="cardContent cardImageContainer">';
-            var iconUrl = imageHelper.getDeviceIcon(device.Name);
+            var iconUrl = imageHelper.getDeviceIcon(device);
 
             if (iconUrl) {
                 deviceHtml += '<div class="cardImage" style="background-image:url(\'' + iconUrl + "');background-size: auto 64%;background-position:center center;\">";

src/controllers/itemdetailpage.js

@@ -1274,7 +1274,7 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
                     coverImage: "MusicAlbum" == item.Type || "MusicArtist" == item.Type,
                     overlayPlayButton: true,
                     overlayText: false,
-                    showYear: "Movie" === item.Type || "Trailer" === item.Type
+                    showYear: "Movie" === item.Type || "Trailer" === item.Type || "Series" === item.Type
                 });
                 var similarContent = similarCollapsible.querySelector(".similarContent");
                 similarContent.innerHTML = html;
@@ -1740,6 +1740,7 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
             items: items,
             shape: shape,
             showTitle: true,
+            showYear: "Video" === type.mediaType || "Series" === type.type,
             centerText: true,
             lazy: true,
             showDetailsMenu: true,