From 7d520784700d057defaa0155dcc9c577b6c549a0 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 27 Jul 2016 15:33:53 -0400 Subject: [PATCH 1/8] 3.0.6010 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 3b18c027e..d81f6c71c 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.0.6010")] From 40530f729301ba3c7c631ef082a96955cfb4e256 Mon Sep 17 00:00:00 2001 From: Luke Date: Wed, 27 Jul 2016 15:44:28 -0400 Subject: [PATCH 2/8] update mac project --- .../Emby.Server.Mac.csproj | 139 ++++++++++++------ 1 file changed, 98 insertions(+), 41 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 4ada5df68..6d56cc99b 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -14,7 +14,7 @@ MediaBrowser.Server.Mac.MainClass A personal media server - v4.5 + v4.6.1 true @@ -45,7 +45,7 @@ prompt 4 false - false + true true false Developer ID Application @@ -1494,6 +1494,18 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\mediainfo\rotten.png + + Resources\dashboard-ui\bower_components\emby-webcomponents\metadataeditor\metadataeditor.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\metadataeditor\metadataeditor.template.html + + + Resources\dashboard-ui\bower_components\emby-webcomponents\metadataeditor\personeditor.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\metadataeditor\personeditor.template.html + Resources\dashboard-ui\bower_components\emby-webcomponents\multiselect\multiselect.css @@ -1584,42 +1596,123 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\slideshow\style.css + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\ar.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\bg-BG.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\ca.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\cs.json + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\da.json Resources\dashboard-ui\bower_components\emby-webcomponents\strings\de.json + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\el.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\en-GB.json + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\en-US.json + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\es-AR.json + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\es-MX.json + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\es.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\fi.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\fr-CA.json + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\fr.json + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\gsw.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\he.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\hr.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\hu.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\id.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\it.json + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\kk.json + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\ko.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\ms.json + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\nb.json Resources\dashboard-ui\bower_components\emby-webcomponents\strings\nl.json + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\pl.json + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\pt-BR.json Resources\dashboard-ui\bower_components\emby-webcomponents\strings\pt-PT.json + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\ro.json + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\ru.json + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\sk.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\sl-SI.json + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\sv.json + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\tr.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\uk.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\vi.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\zh-CN.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\zh-HK.json + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\zh-TW.json @@ -2592,24 +2685,6 @@ Resources\dashboard-ui\bower_components\iron-validatable-behavior\test\test-validatable.html - - Resources\dashboard-ui\bower_components\isMobile\.bower.json - - - Resources\dashboard-ui\bower_components\isMobile\README.md - - - Resources\dashboard-ui\bower_components\isMobile\bower.json - - - Resources\dashboard-ui\bower_components\isMobile\isMobile.js - - - Resources\dashboard-ui\bower_components\isMobile\isMobile.min.js - - - Resources\dashboard-ui\bower_components\isMobile\package.json - Resources\dashboard-ui\bower_components\jquery\.bower.json @@ -3675,6 +3750,9 @@ Resources\dashboard-ui\components\channelmapper\channelmapper.js + + Resources\dashboard-ui\components\directorybrowser\directorybrowser.css + Resources\dashboard-ui\components\directorybrowser\directorybrowser.js @@ -3741,18 +3819,6 @@ Resources\dashboard-ui\components\medialibraryeditor\medialibraryeditor.template.html - - Resources\dashboard-ui\components\metadataeditor\metadataeditor.js - - - Resources\dashboard-ui\components\metadataeditor\metadataeditor.template.html - - - Resources\dashboard-ui\components\metadataeditor\personeditor.js - - - Resources\dashboard-ui\components\metadataeditor\personeditor.template.html - Resources\dashboard-ui\components\navdrawer\navdrawer.css @@ -3813,9 +3879,6 @@ Resources\dashboard-ui\css\tileitem.css - - Resources\dashboard-ui\css\fonts\Montserrat.woff - Resources\dashboard-ui\css\images\ani_equalizer_black.gif @@ -4089,9 +4152,6 @@ Resources\dashboard-ui\devices\ios\ios.css - - Resources\dashboard-ui\devices\windowsphone\wp.css - Resources\dashboard-ui\files\dummy.mp4 @@ -4185,9 +4245,6 @@ Resources\dashboard-ui\scripts\episodes.js - - Resources\dashboard-ui\scripts\extensions.js - Resources\dashboard-ui\scripts\externalplayer.js From 100236f416e1917d57913f117b7f0c4ee9069d0b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 29 Jul 2016 11:59:37 -0400 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 d81f6c71c..7f78e641a 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6010")] +[assembly: AssemblyVersion("3.1.81")] From 4be3ee433bf3d3d2a500a5b41b11407fb58b2445 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 29 Jul 2016 12:01:11 -0400 Subject: [PATCH 4/8] 3.0.6020 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 7f78e641a..d5d322353 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.81")] +[assembly: AssemblyVersion("3.0.6020")] From ba6cba0b7f28496280a0bedb68dd60ab35d2e256 Mon Sep 17 00:00:00 2001 From: Luke Date: Sun, 31 Jul 2016 16:58:40 -0400 Subject: [PATCH 5/8] update mac project --- .../Emby.Server.Mac.csproj | 102 ++---------------- 1 file changed, 9 insertions(+), 93 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 6d56cc99b..3c16eacfe 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -618,6 +618,9 @@ Resources\dashboard-ui\serversecurity.html + + Resources\dashboard-ui\serviceworker.js + Resources\dashboard-ui\shared.html @@ -1011,9 +1014,6 @@ Resources\dashboard-ui\bower_components\emby-apiclient\connectionmanager.js - - Resources\dashboard-ui\bower_components\emby-apiclient\connectservice.js - Resources\dashboard-ui\bower_components\emby-apiclient\credentials.js @@ -1107,9 +1107,6 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\layoutmanager.js - - Resources\dashboard-ui\bower_components\emby-webcomponents\librarychangednotifications.js - Resources\dashboard-ui\bower_components\emby-webcomponents\multidownload.js @@ -1512,6 +1509,12 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\multiselect\multiselect.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\notifications\notificationicon.png + + + Resources\dashboard-ui\bower_components\emby-webcomponents\notifications\notifications.js + Resources\dashboard-ui\bower_components\emby-webcomponents\page.js\page.js @@ -2499,63 +2502,6 @@ Resources\dashboard-ui\bower_components\iron-input\test\letters-only.html - - Resources\dashboard-ui\bower_components\iron-location\.bower.json - - - Resources\dashboard-ui\bower_components\iron-location\.gitignore - - - Resources\dashboard-ui\bower_components\iron-location\.travis.yml - - - Resources\dashboard-ui\bower_components\iron-location\CONTRIBUTING.md - - - Resources\dashboard-ui\bower_components\iron-location\README.md - - - Resources\dashboard-ui\bower_components\iron-location\bower.json - - - Resources\dashboard-ui\bower_components\iron-location\index.html - - - Resources\dashboard-ui\bower_components\iron-location\iron-location.html - - - Resources\dashboard-ui\bower_components\iron-location\iron-query-params.html - - - Resources\dashboard-ui\bower_components\iron-location\.github\ISSUE_TEMPLATE.md - - - Resources\dashboard-ui\bower_components\iron-location\demo\index.html - - - Resources\dashboard-ui\bower_components\iron-location\demo\iron-query-params.html - - - Resources\dashboard-ui\bower_components\iron-location\test\index.html - - - Resources\dashboard-ui\bower_components\iron-location\test\initialization-cases.html - - - Resources\dashboard-ui\bower_components\iron-location\test\initialization-iframe.html - - - Resources\dashboard-ui\bower_components\iron-location\test\initialization-tests.html - - - Resources\dashboard-ui\bower_components\iron-location\test\iron-location.html - - - Resources\dashboard-ui\bower_components\iron-location\test\iron-query-params.html - - - Resources\dashboard-ui\bower_components\iron-location\test\redirection.html - Resources\dashboard-ui\bower_components\iron-meta\.bower.json @@ -3885,9 +3831,6 @@ Resources\dashboard-ui\css\images\ani_equalizer_white.gif - - Resources\dashboard-ui\css\images\checkmarkblack.png - Resources\dashboard-ui\css\images\checkmarkgreen.png @@ -3921,15 +3864,6 @@ Resources\dashboard-ui\css\images\rotten.png - - Resources\dashboard-ui\css\images\splash.jpg - - - Resources\dashboard-ui\css\images\splash720.jpg - - - Resources\dashboard-ui\css\images\stars.png - Resources\dashboard-ui\css\images\touchicon.png @@ -4023,9 +3957,6 @@ Resources\dashboard-ui\css\images\items\list\person.png - - Resources\dashboard-ui\css\images\items\searchhintsv2\tv.png - Resources\dashboard-ui\css\images\media\chapterflyout.png @@ -4035,21 +3966,6 @@ Resources\dashboard-ui\css\images\media\play.png - - Resources\dashboard-ui\css\images\notifications\cancelled.png - - - Resources\dashboard-ui\css\images\notifications\done.png - - - Resources\dashboard-ui\css\images\notifications\download.png - - - Resources\dashboard-ui\css\images\notifications\error.png - - - Resources\dashboard-ui\css\images\notifications\info.png - Resources\dashboard-ui\css\images\supporter\nonsupporterbadge.png From 0c3b7a33c29956aafe54f7e956199c0671f92eff Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 4 Aug 2016 00:47:50 -0400 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 d5d322353..d852537b2 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6020")] +[assembly: AssemblyVersion("3.1.89")] From 980b9baeb514fa3ab18e481d66a52eb4df8a45c0 Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 4 Aug 2016 00:54:04 -0400 Subject: [PATCH 7/8] update mac project --- .../Emby.Server.Mac.csproj | 54 +++++++++++-------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 3c16eacfe..dc19921b6 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -1026,6 +1026,9 @@ Resources\dashboard-ui\bower_components\emby-apiclient\localassetmanager.js + + Resources\dashboard-ui\bower_components\emby-apiclient\serverdiscovery-chrome.js + Resources\dashboard-ui\bower_components\emby-apiclient\serverdiscovery.js @@ -1164,6 +1167,18 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\backdrop\style.css + + Resources\dashboard-ui\bower_components\emby-webcomponents\cardbuilder\card.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\cardbuilder\cardbuilder.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\cardbuilder\chaptercardbuilder.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\cardbuilder\peoplecardbuilder.js + Resources\dashboard-ui\bower_components\emby-webcomponents\collectioneditor\collectioneditor.js @@ -1173,6 +1188,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\confirm\nativeconfirm.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\dialog\dialog.css + Resources\dashboard-ui\bower_components\emby-webcomponents\dialog\dialog.js @@ -1458,27 +1476,30 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\itemhovermenu\itemhovermenu.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\itemidentifier\itemidentifier.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\itemidentifier\itemidentifier.template.html + Resources\dashboard-ui\bower_components\emby-webcomponents\listview\listview.css Resources\dashboard-ui\bower_components\emby-webcomponents\listview\listview.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\loading\loading-legacy.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\loading\loading-legacy.js + Resources\dashboard-ui\bower_components\emby-webcomponents\loading\loading-lite.css Resources\dashboard-ui\bower_components\emby-webcomponents\loading\loading-lite.js - - Resources\dashboard-ui\bower_components\emby-webcomponents\loading\loading-smarttv.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\mediainfo\fresh.png @@ -3432,6 +3453,9 @@ Resources\dashboard-ui\bower_components\paper-progress\paper-progress.html + + Resources\dashboard-ui\bower_components\paper-progress\.github\ISSUE_TEMPLATE.md + Resources\dashboard-ui\bower_components\paper-progress\demo\index.html @@ -3747,12 +3771,6 @@ Resources\dashboard-ui\components\imageuploader\imageuploader.template.html - - Resources\dashboard-ui\components\itemidentifier\itemidentifier.js - - - Resources\dashboard-ui\components\itemidentifier\itemidentifier.template.html - Resources\dashboard-ui\components\medialibrarycreator\medialibrarycreator.js @@ -3783,9 +3801,6 @@ Resources\dashboard-ui\components\tvproviders\xmltv.template.html - - Resources\dashboard-ui\css\card.css - Resources\dashboard-ui\css\chromecast.css @@ -3822,9 +3837,6 @@ Resources\dashboard-ui\css\site.css - - Resources\dashboard-ui\css\tileitem.css - Resources\dashboard-ui\css\images\ani_equalizer_black.gif From c7798fcd4807279e08ce773ad16732b09a411b4d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 4 Aug 2016 00:55:45 -0400 Subject: [PATCH 8/8] 3.0.6030 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index d852537b2..7ffbc0f47 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.0.6030")]