diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index f2434afe3a..c469d97d62 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -325,12 +325,6 @@ namespace MediaBrowser.Model.Dto
/// The user data.
public UserItemDataDto UserData { get; set; }
- ///
- /// Gets or sets the recently added item count.
- ///
- /// The recently added item count.
- public int? RecentlyAddedItemCount { get; set; }
-
///
/// Gets or sets the played percentage.
///
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index e1857ca600..47a441a4d6 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -413,7 +413,7 @@ namespace MediaBrowser.Providers.MediaInfo
{
get
{
- return new[] { ".srt", ".ssa", ".ass" };
+ return new[] { ".srt", ".ssa", ".ass", ".sub" };
}
}
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 1da0b3db9b..97a0ee7038 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -1419,7 +1419,6 @@ namespace MediaBrowser.Server.Implementations.Dto
/// Task.
private void SetSpecialCounts(Folder folder, User user, BaseItemDto dto, List fields)
{
- var rcentlyAddedItemCount = 0;
var recursiveItemCount = 0;
var unplayed = 0;
long runtime = 0;
@@ -1456,12 +1455,6 @@ namespace MediaBrowser.Server.Implementations.Dto
recursiveItemCount++;
- // Check is recently added
- //if (child.IsRecentlyAdded())
- //{
- // rcentlyAddedItemCount++;
- //}
-
var isUnplayed = true;
// Incrememt totalPercentPlayed
@@ -1490,7 +1483,6 @@ namespace MediaBrowser.Server.Implementations.Dto
}
dto.RecursiveItemCount = recursiveItemCount;
- dto.RecentlyAddedItemCount = rcentlyAddedItemCount;
dto.RecursiveUnplayedItemCount = unplayed;
if (recursiveItemCount > 0)
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 9ad5c77c10..258d7bff22 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -285,10 +285,13 @@
"PasswordLocalhostMessage": "Passwords are not required when logging in from localhost.",
"TabGuide": "Guide",
"TabChannels": "Channels",
+ "TabCollections": "Collections",
"HeaderChannels": "Channels",
"TabRecordings": "Recordings",
"TabScheduled": "Scheduled",
"TabSeries": "Series",
+ "TabFavorites": "Favorites",
+ "TabMyLibrary": "My Library",
"ButtonCancelRecording": "Cancel Recording",
"HeaderPrePostPadding": "Pre/Post Padding",
"LabelPrePaddingMinutes": "Pre-padding minutes:",
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 58a0c84b0f..e551a6e6b9 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -518,6 +518,7 @@ namespace MediaBrowser.WebDashboard.Api
"mediacontroller.js",
"chromecast.js",
"contextmenu.js",
+ "backdrops.js",
"mediaplayer.js",
"mediaplayer-video.js",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index ac9d700fab..64ff1cf152 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -166,6 +166,18 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest
@@ -253,6 +265,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
@@ -565,6 +580,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest