From 681ffa96b379a361d3bca6393d8167f82c94dddf Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 14 Feb 2016 23:28:25 -0500 Subject: [PATCH 1/8] 3.0.5868 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index c9d1c034c..360405ba7 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5878")] +[assembly: AssemblyVersion("3.0.5868")] From ea837903052339818336a3c677c0660cb3c15c33 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 14 Feb 2016 23:51:14 -0500 Subject: [PATCH 2/8] 3.0.5870 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 360405ba7..0eadfe2a8 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5868")] +[assembly: AssemblyVersion("3.0.5870")] From 12855121607918671aab70fabb0b42180c0fe02c Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 16 Feb 2016 12:15:06 -0500 Subject: [PATCH 3/8] fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 0eadfe2a8..638530ade 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5870")] +[assembly: AssemblyVersion("3.0.5879")] From e37bf6b986dcc3357c405fb4494a4700abac49d4 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 16 Feb 2016 12:15:50 -0500 Subject: [PATCH 4/8] restore changes --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 638530ade..d3b9c9426 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5879")] +[assembly: AssemblyVersion("3.0.5867")] From b9ce0a32234f2f6c1902e294b1f1f81fd7f79273 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 16 Feb 2016 13:06:36 -0500 Subject: [PATCH 5/8] 3.0.5871 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index d3b9c9426..033efbbd7 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5867")] +[assembly: AssemblyVersion("3.0.5871")] From b42317c0c4aa6a12b93cdbd33ad47b4ceb520ee3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 16 Feb 2016 15:20:48 -0500 Subject: [PATCH 6/8] fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 033efbbd7..dd370f98d 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5871")] +[assembly: AssemblyVersion("3.0.5880")] From deb712b1652abe026278038fb4e829b2979e6be4 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 16 Feb 2016 15:21:36 -0500 Subject: [PATCH 7/8] restore change --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index dd370f98d..033efbbd7 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5880")] +[assembly: AssemblyVersion("3.0.5871")] From 9638b242a4c8f614ed4ffa256422cd0ba3a029e2 Mon Sep 17 00:00:00 2001 From: Luke Date: Tue, 16 Feb 2016 15:39:48 -0500 Subject: [PATCH 8/8] update mac project --- MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 0b4dce140..7ad1c55f1 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -1325,6 +1325,12 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\images\persistentimagefetcher.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\loading\loading.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\loading\loading.js + Resources\dashboard-ui\bower_components\emby-webcomponents\paperdialoghelper\paperdialoghelper.css @@ -1352,6 +1358,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\slideshow\style.css + + Resources\dashboard-ui\bower_components\emby-webcomponents\toast\toast.js + Resources\dashboard-ui\bower_components\fastclick\.bower.json @@ -8279,6 +8288,9 @@ Resources\dashboard-ui\components\filterdialog\filterdialog.template.html + + Resources\dashboard-ui\components\filterdialog\style.css + Resources\dashboard-ui\components\guestinviter\guestinviter.js @@ -9122,9 +9134,6 @@ Resources\dashboard-ui\scripts\pluginspage.js - - Resources\dashboard-ui\scripts\queryfilters.js - Resources\dashboard-ui\scripts\ratingdialog.js