From 295d47a4878f6981125e12dd6e15d1472b73a476 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 4 Aug 2016 01:03:05 -0400 Subject: [PATCH 01/17] fix version --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 7ffbc0f475..d852537b24 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.1.89")] From 8cca5dfb03d126b87b007e4699b061433991d3ae Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 5 Aug 2016 02:13:19 -0400 Subject: [PATCH 02/17] fix merge conflict --- SharedVersion.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index d852537b24..8de20ebed3 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.89")] +[assembly: AssemblyVersion("3.1.*")] +//[assembly: AssemblyVersion("3.1.80")] From bfe746d4e08e9b5d8422856000f0479853df64e4 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 5 Aug 2016 02:14:13 -0400 Subject: [PATCH 03/17] 3.1.90 --- SharedVersion.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 8de20ebed3..07028185d1 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.1.*")] -//[assembly: AssemblyVersion("3.1.80")] +//[assembly: AssemblyVersion("3.1.*")] +[assembly: AssemblyVersion("3.1.90")] From 7f0d4c72109e4e647f6388dc2286891e749db268 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 6 Aug 2016 00:50:24 -0400 Subject: [PATCH 04/17] 3.1.91 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 07028185d1..e35552d6a6 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.90")] +[assembly: AssemblyVersion("3.1.91")] From a571ee38ceafc0a1f30ded3f5bd2c6aba1d940da Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 6 Aug 2016 10:11:47 -0400 Subject: [PATCH 05/17] 3.1.92 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index e35552d6a6..ac12faf1cd 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.91")] +[assembly: AssemblyVersion("3.1.92")] From 1640bcb28904bccb0c31a00377a9399925cf327d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 6 Aug 2016 17:11:43 -0400 Subject: [PATCH 06/17] 3.1.93 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index ac12faf1cd..ed6157b188 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.92")] +[assembly: AssemblyVersion("3.1.93")] From dd013bf622759e3ca13a1236d3f016dc5051ce47 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 7 Aug 2016 02:40:05 -0400 Subject: [PATCH 07/17] 3.1.94 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index ed6157b188..9596e1d73d 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.93")] +[assembly: AssemblyVersion("3.1.94")] From 2eeae1c5500e01b319da4075ac62d0d2def022ad Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 7 Aug 2016 16:17:46 -0400 Subject: [PATCH 08/17] 3.1.95 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 9596e1d73d..f10a805344 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.94")] +[assembly: AssemblyVersion("3.1.95")] From 55630d54cc897031ba743824e0c42b481dfe4833 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 7 Aug 2016 17:17:40 -0400 Subject: [PATCH 09/17] restore version --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index f10a805344..7ffbc0f475 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 10/17] 3.0.6040 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 7ffbc0f475..255be1dff7 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 11/17] 3.0.6050 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 255be1dff7..9b3db66689 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 12/17] 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 dc19921b67..349cc94452 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 e652b996b6d4ea46d897fa670309e15bbbef158b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 8 Aug 2016 14:18:32 -0400 Subject: [PATCH 13/17] 3.1.96 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index f10a805344..6d6ac0ab63 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.1.96")] From bfdd9e8936557fbeb9147f81c18b2b967cd7fb4a Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 9 Aug 2016 01:13:23 -0400 Subject: [PATCH 14/17] 3.1.97 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 6d6ac0ab63..6dfb8bc40e 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.96")] +[assembly: AssemblyVersion("3.1.97")] From 9935397d12020c5a52afe9f8f390b5581bef5d03 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 9 Aug 2016 14:23:12 -0400 Subject: [PATCH 15/17] fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 9b3db66689..6dfb8bc40e 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 16/17] 3.0.6060 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 6dfb8bc40e..a81b44de7a 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 17/17] 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 349cc94452..236b0879f9 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