From 55630d54cc897031ba743824e0c42b481dfe4833 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 7 Aug 2016 17:17:40 -0400 Subject: [PATCH 1/7] restore version --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index f10a80534..7ffbc0f47 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.95")] +[assembly: AssemblyVersion("3.0.6030")] From 90858d44d078174760a9ba2548d82c03a024301d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 7 Aug 2016 18:34:28 -0400 Subject: [PATCH 2/7] 3.0.6040 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 7ffbc0f47..255be1dff 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6030")] +[assembly: AssemblyVersion("3.0.6040")] From 1d14c98ec8fbbccfd53a9fda726c241feb0c35b3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 7 Aug 2016 20:01:50 -0400 Subject: [PATCH 3/7] 3.0.6050 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 255be1dff..9b3db6668 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6040")] +[assembly: AssemblyVersion("3.0.6050")] From 0741d7aa3f07b02e623ac91b5f22fd8b81e7002b Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 8 Aug 2016 00:26:52 -0400 Subject: [PATCH 4/7] update mac project --- .../Emby.Server.Mac.csproj | 117 ------------------ 1 file changed, 117 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index dc19921b6..349cc9445 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -3183,36 +3183,6 @@ Resources\dashboard-ui\bower_components\paper-checkbox\test\index.html - - Resources\dashboard-ui\bower_components\paper-fab\.bower.json - - - Resources\dashboard-ui\bower_components\paper-fab\.gitignore - - - Resources\dashboard-ui\bower_components\paper-fab\README.md - - - Resources\dashboard-ui\bower_components\paper-fab\bower.json - - - Resources\dashboard-ui\bower_components\paper-fab\index.html - - - Resources\dashboard-ui\bower_components\paper-fab\paper-fab.html - - - Resources\dashboard-ui\bower_components\paper-fab\demo\index.html - - - Resources\dashboard-ui\bower_components\paper-fab\test\a11y.html - - - Resources\dashboard-ui\bower_components\paper-fab\test\basic.html - - - Resources\dashboard-ui\bower_components\paper-fab\test\index.html - Resources\dashboard-ui\bower_components\paper-icon-button\.bower.json @@ -3339,93 +3309,6 @@ Resources\dashboard-ui\bower_components\paper-input\test\paper-textarea.html - - Resources\dashboard-ui\bower_components\paper-item\.bower.json - - - Resources\dashboard-ui\bower_components\paper-item\.gitignore - - - Resources\dashboard-ui\bower_components\paper-item\.travis.yml - - - Resources\dashboard-ui\bower_components\paper-item\CONTRIBUTING.md - - - Resources\dashboard-ui\bower_components\paper-item\README.md - - - Resources\dashboard-ui\bower_components\paper-item\all-imports.html - - - Resources\dashboard-ui\bower_components\paper-item\bower.json - - - Resources\dashboard-ui\bower_components\paper-item\index.html - - - Resources\dashboard-ui\bower_components\paper-item\paper-icon-item.html - - - Resources\dashboard-ui\bower_components\paper-item\paper-item-behavior.html - - - Resources\dashboard-ui\bower_components\paper-item\paper-item-body.html - - - Resources\dashboard-ui\bower_components\paper-item\paper-item-shared-styles.html - - - Resources\dashboard-ui\bower_components\paper-item\paper-item.html - - - Resources\dashboard-ui\bower_components\paper-item\.github\ISSUE_TEMPLATE.md - - - Resources\dashboard-ui\bower_components\paper-item\demo\index.html - - - Resources\dashboard-ui\bower_components\paper-item\test\index.html - - - Resources\dashboard-ui\bower_components\paper-item\test\paper-item.html - - - Resources\dashboard-ui\bower_components\paper-material\.bower.json - - - Resources\dashboard-ui\bower_components\paper-material\.gitignore - - - Resources\dashboard-ui\bower_components\paper-material\.travis.yml - - - Resources\dashboard-ui\bower_components\paper-material\CONTRIBUTING.md - - - Resources\dashboard-ui\bower_components\paper-material\README.md - - - Resources\dashboard-ui\bower_components\paper-material\bower.json - - - Resources\dashboard-ui\bower_components\paper-material\index.html - - - Resources\dashboard-ui\bower_components\paper-material\paper-material-shared-styles.html - - - Resources\dashboard-ui\bower_components\paper-material\paper-material.html - - - Resources\dashboard-ui\bower_components\paper-material\demo\index.html - - - Resources\dashboard-ui\bower_components\paper-material\test\index.html - - - Resources\dashboard-ui\bower_components\paper-material\test\paper-material.html - Resources\dashboard-ui\bower_components\paper-progress\.bower.json From 9935397d12020c5a52afe9f8f390b5581bef5d03 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 9 Aug 2016 14:23:12 -0400 Subject: [PATCH 5/7] fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 9b3db6668..6dfb8bc40 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6050")] +[assembly: AssemblyVersion("3.1.97")] From 2ce8b8207765a5fb60e089ece9af2e32fc9d3311 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 9 Aug 2016 14:24:11 -0400 Subject: [PATCH 6/7] 3.0.6060 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 6dfb8bc40..a81b44de7 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.97")] +[assembly: AssemblyVersion("3.0.6060")] From ac8c4ccc3ce53a4eafbd0493e9fe333d95b28730 Mon Sep 17 00:00:00 2001 From: Luke Date: Tue, 9 Aug 2016 16:40:07 -0400 Subject: [PATCH 7/7] update mac project --- MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 349cc9445..236b0879f 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -1179,6 +1179,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\cardbuilder\peoplecardbuilder.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\cardbuilder\roundcard.css + Resources\dashboard-ui\bower_components\emby-webcomponents\collectioneditor\collectioneditor.js