Merge branch 'master' into dev

4 files changed, 38 insertions, 5 deletions

diff --git a/MediaBrowser.Api/Reports/ReportsService.cs b/MediaBrowser.Api/Reports/ReportsService.cs
index 6c2886f5b..6cbe2fd89 100644
--- a/MediaBrowser.Api/Reports/ReportsService.cs
+++ b/MediaBrowser.Api/Reports/ReportsService.cs
@@ -215,6 +215,7 @@ namespace MediaBrowser.Api.Reports
 
                 Filter = i => ApplyAdditionalFilters(request, i, user, _libraryManager),
 
+                IsFavorite = request.IsFavorite,
                 Limit = request.Limit,
                 StartIndex = request.StartIndex,
                 IsMissing = request.IsMissing,
@@ -301,8 +302,11 @@ namespace MediaBrowser.Api.Reports
                 }
             }
 
-            if (request.HasQueryLimit)
-                query.Limit = request.Limit;
+            if (request.HasQueryLimit == false)
+            {
+                query.StartIndex = null;
+                query.Limit = null;
+            }
 
             return query;
         }
diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
index aa86bfb33..6867f6308 100644
--- a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
@@ -169,6 +169,13 @@ namespace MediaBrowser.Api.UserLibrary
         public string Filters { get; set; }
 
         /// <summary>
+        /// Gets or sets the Isfavorite option
+        /// </summary>
+        /// <value>IsFavorite</value>
+        [ApiMember(Name = "IsFavorite", Description = "Optional filter by items that are marked as favorite, or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
+        public bool? IsFavorite { get; set; }
+
+        /// <summary>
         /// Gets or sets the media types.
         /// </summary>
         /// <value>The media types.</value>
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index 489580555..1c5d5b345 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -186,6 +186,7 @@ namespace MediaBrowser.Api.UserLibrary
 
                 Filter = i => ApplyAdditionalFilters(request, i, user, _libraryManager),
 
+                IsFavorite = request.IsFavorite,
                 Limit = request.Limit,
                 StartIndex = request.StartIndex,
                 IsMissing = request.IsMissing,
diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index 374476d92..6cc96490e 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -488,6 +488,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\reports.html">

       <Link>Resources\dashboard-ui\reports.html</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\robots.txt">

+      <Link>Resources\dashboard-ui\robots.txt</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scheduledtask.html">

       <Link>Resources\dashboard-ui\scheduledtask.html</Link>

     </BundleResource>

@@ -545,9 +548,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\userprofiles.html">

       <Link>Resources\dashboard-ui\userprofiles.html</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\vulcanize.txt">

-      <Link>Resources\dashboard-ui\vulcanize.txt</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\wizardagreement.html">

       <Link>Resources\dashboard-ui\wizardagreement.html</Link>

     </BundleResource>

@@ -1121,6 +1121,15 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\browserdeviceprofile.js">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\browserdeviceprofile.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\datetime.js">

+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\datetime.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\fetchhelper.js">

+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\fetchhelper.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\qualityoptions.js">

+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\qualityoptions.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\requirecss.js">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\requirecss.js</Link>

     </BundleResource>

@@ -1874,6 +1883,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-icons\notification-icons.html">

       <Link>Resources\dashboard-ui\bower_components\iron-icons\notification-icons.html</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-icons\places-icons.html">

+      <Link>Resources\dashboard-ui\bower_components\iron-icons\places-icons.html</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-icons\social-icons.html">

       <Link>Resources\dashboard-ui\bower_components\iron-icons\social-icons.html</Link>

     </BundleResource>

@@ -3548,6 +3560,12 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-progress\.gitignore">

       <Link>Resources\dashboard-ui\bower_components\paper-progress\.gitignore</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-progress\.travis.yml">

+      <Link>Resources\dashboard-ui\bower_components\paper-progress\.travis.yml</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-progress\CONTRIBUTING.md">

+      <Link>Resources\dashboard-ui\bower_components\paper-progress\CONTRIBUTING.md</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-progress\README.md">

       <Link>Resources\dashboard-ui\bower_components\paper-progress\README.md</Link>

     </BundleResource>

@@ -5207,6 +5225,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\strings\html\hu.json">

       <Link>Resources\dashboard-ui\strings\html\hu.json</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\strings\html\id.json">

+      <Link>Resources\dashboard-ui\strings\html\id.json</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\strings\html\it.json">

       <Link>Resources\dashboard-ui\strings\html\it.json</Link>

     </BundleResource>