diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index a46fe06012..792a4e3090 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -39,14 +39,17 @@
..\packages\morelinq.1.0.15631-beta\lib\net35\MoreLinq.dll
-
- ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Common.dll
+
+ False
+ ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Common.dll
-
- ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Interfaces.dll
+
+ False
+ ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Interfaces.dll
-
- ..\packages\ServiceStack.Text.3.9.42\lib\net35\ServiceStack.Text.dll
+
+ False
+ ..\packages\ServiceStack.Text.3.9.43\lib\net35\ServiceStack.Text.dll
diff --git a/MediaBrowser.Api/PackageService.cs b/MediaBrowser.Api/PackageService.cs
index ccfcc12550..e9e243ec85 100644
--- a/MediaBrowser.Api/PackageService.cs
+++ b/MediaBrowser.Api/PackageService.cs
@@ -42,6 +42,9 @@ namespace MediaBrowser.Api
[ApiMember(Name = "TargetSystems", Description = "Optional. Filter by target system type. Allows multiple, comma delimited.", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "GET", AllowMultiple = true)]
public string TargetSystems { get; set; }
+
+ [ApiMember(Name = "IsPremium", Description = "Optiona. Filter by premium status", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")]
+ public bool? IsPremium { get; set; }
}
///
@@ -175,6 +178,11 @@ namespace MediaBrowser.Api
packages = packages.Where(p => apps.Contains(p.targetSystem));
}
+ if (request.IsPremium.HasValue)
+ {
+ packages = packages.Where(p => p.isPremium == request.IsPremium.Value);
+ }
+
return ToOptimizedResult(packages.ToList());
}
diff --git a/MediaBrowser.Api/packages.config b/MediaBrowser.Api/packages.config
index b45320b0e3..b8e4a63339 100644
--- a/MediaBrowser.Api/packages.config
+++ b/MediaBrowser.Api/packages.config
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
index ee0e6022ec..f5b6ab56c9 100644
--- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
+++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
@@ -44,9 +44,9 @@
..\packages\protobuf-net.2.0.0.621\lib\net40\protobuf-net.dll
-
+
False
- ..\packages\ServiceStack.Text.3.9.42\lib\net35\ServiceStack.Text.dll
+ ..\packages\ServiceStack.Text.3.9.43\lib\net35\ServiceStack.Text.dll
..\packages\SimpleInjector.2.0.0-beta5\lib\net40-client\SimpleInjector.dll
diff --git a/MediaBrowser.Common.Implementations/packages.config b/MediaBrowser.Common.Implementations/packages.config
index 0b5dd5b791..0aa68c75c1 100644
--- a/MediaBrowser.Common.Implementations/packages.config
+++ b/MediaBrowser.Common.Implementations/packages.config
@@ -2,6 +2,6 @@
-
+
\ No newline at end of file
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index b2553ce225..22d1e1221d 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -38,14 +38,17 @@
-
- ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Common.dll
+
+ False
+ ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Common.dll
-
- ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Interfaces.dll
+
+ False
+ ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Interfaces.dll
-
- ..\packages\ServiceStack.Text.3.9.42\lib\net35\ServiceStack.Text.dll
+
+ False
+ ..\packages\ServiceStack.Text.3.9.43\lib\net35\ServiceStack.Text.dll
diff --git a/MediaBrowser.Common/packages.config b/MediaBrowser.Common/packages.config
index 46c46de10d..b5e4f03216 100644
--- a/MediaBrowser.Common/packages.config
+++ b/MediaBrowser.Common/packages.config
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index 849b9cfeec..690f976052 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -397,31 +397,6 @@ namespace MediaBrowser.Controller.Entities
{
_rootFolderPath = null;
RootFolder = null;
-
- if (config.UseCustomLibrary)
- {
- CopyDefaultLibraryPathsIfNeeded();
- }
- }
- }
-
- ///
- /// Copies the default library paths if needed.
- ///
- private void CopyDefaultLibraryPathsIfNeeded()
- {
- var userPath = RootFolderPath;
-
- var defaultPath = ConfigurationManager.ApplicationPaths.DefaultUserViewsPath;
-
- if (userPath.Equals(defaultPath, StringComparison.OrdinalIgnoreCase))
- {
- return;
- }
-
- if (!Directory.EnumerateFileSystemEntries(userPath, "*.lnk", SearchOption.AllDirectories).Any())
- {
- FileSystem.CopyAll(defaultPath, userPath);
}
}
}
diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
index a72fccfd49..eccada0f53 100644
--- a/MediaBrowser.Installer/MediaBrowser.Installer.csproj
+++ b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
@@ -82,9 +82,9 @@
False
..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll
-
+
False
- ..\packages\ServiceStack.Text.3.9.42\lib\net35\ServiceStack.Text.dll
+ ..\packages\ServiceStack.Text.3.9.43\lib\net35\ServiceStack.Text.dll
diff --git a/MediaBrowser.Installer/packages.config b/MediaBrowser.Installer/packages.config
index 2f1b5c8aaf..8d0ce68b42 100644
--- a/MediaBrowser.Installer/packages.config
+++ b/MediaBrowser.Installer/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 0ce5a7f44a..043ef08450 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -51,45 +51,45 @@
..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll
-
+
False
- ..\packages\ServiceStack.3.9.42\lib\net35\ServiceStack.dll
+ ..\packages\ServiceStack.3.9.43\lib\net35\ServiceStack.dll
-
+
False
- ..\packages\ServiceStack.Api.Swagger.3.9.42\lib\net35\ServiceStack.Api.Swagger.dll
+ ..\packages\ServiceStack.Api.Swagger.3.9.43\lib\net35\ServiceStack.Api.Swagger.dll
-
+
False
- ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Common.dll
+ ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Common.dll
-
+
False
- ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Interfaces.dll
+ ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Interfaces.dll
False
..\packages\ServiceStack.Logging.NLog.1.0.8.0\lib\net35\ServiceStack.Logging.NLog.dll
-
+
False
- ..\packages\ServiceStack.OrmLite.SqlServer.3.9.42\lib\ServiceStack.OrmLite.dll
+ ..\packages\ServiceStack.OrmLite.SqlServer.3.9.43\lib\ServiceStack.OrmLite.dll
False
- ..\packages\ServiceStack.OrmLite.SqlServer.3.9.42\lib\ServiceStack.OrmLite.SqlServer.dll
+ ..\packages\ServiceStack.OrmLite.SqlServer.3.9.43\lib\ServiceStack.OrmLite.SqlServer.dll
-
+
False
- ..\packages\ServiceStack.Redis.3.9.42\lib\net35\ServiceStack.Redis.dll
+ ..\packages\ServiceStack.Redis.3.9.43\lib\net35\ServiceStack.Redis.dll
False
- ..\packages\ServiceStack.3.9.42\lib\net35\ServiceStack.ServiceInterface.dll
+ ..\packages\ServiceStack.3.9.43\lib\net35\ServiceStack.ServiceInterface.dll
-
+
False
- ..\packages\ServiceStack.Text.3.9.42\lib\net35\ServiceStack.Text.dll
+ ..\packages\ServiceStack.Text.3.9.43\lib\net35\ServiceStack.Text.dll
diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
index e985b782f8..d975326f29 100644
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@@ -8,13 +8,13 @@
-
-
-
+
+
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index cc71d5df66..808b8637a3 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -135,14 +135,17 @@
False
..\packages\MediaBrowser.IsoMounting.3.0.51\lib\net45\pfmclrapi.dll
-
- ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Common.dll
+
+ False
+ ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Common.dll
-
- ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Interfaces.dll
+
+ False
+ ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Interfaces.dll
-
- ..\packages\ServiceStack.Text.3.9.42\lib\net35\ServiceStack.Text.dll
+
+ False
+ ..\packages\ServiceStack.Text.3.9.43\lib\net35\ServiceStack.Text.dll
False
diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config
index 1dcbfc4c0f..690801cdf7 100644
--- a/MediaBrowser.ServerApplication/packages.config
+++ b/MediaBrowser.ServerApplication/packages.config
@@ -4,8 +4,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js
index 8380dc8e57..5ac4ecd8f0 100644
--- a/MediaBrowser.WebDashboard/ApiClient.js
+++ b/MediaBrowser.WebDashboard/ApiClient.js
@@ -572,9 +572,12 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
/**
* Gets a list of plugins that are available to be installed
*/
- self.getAvailablePlugins = function () {
+ self.getAvailablePlugins = function (options) {
- var url = self.getUrl("Packages", { PackageType: "UserInstalled" });
+ options = $.extend({}, options || {});
+ options.PackageType = "UserInstalled";
+
+ var url = self.getUrl("Packages", options);
return self.ajax({
type: "GET",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 072f040128..33f89cd23d 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -35,17 +35,17 @@
Always
-
+
False
- ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Common.dll
+ ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Common.dll
-
+
False
- ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Interfaces.dll
+ ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Interfaces.dll
-
+
False
- ..\packages\ServiceStack.Text.3.9.42\lib\net35\ServiceStack.Text.dll
+ ..\packages\ServiceStack.Text.3.9.43\lib\net35\ServiceStack.Text.dll
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index 42d7b089c5..30a541990f 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,6 +1,6 @@
-
-
-
+
+
+
\ No newline at end of file