From 357a3750de7cc1a95719fcdf96fb366d75269675 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 18 Dec 2016 01:28:48 -0500 Subject: [PATCH 01/14] 3.1.0 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 0561738e2..cde531792 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.259")] +[assembly: AssemblyVersion("3.1.0")] From f54ed748376184b3d5f4100ad8c64cef732c226a Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 21 Dec 2016 15:24:20 -0500 Subject: [PATCH 02/14] fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index cde531792..aa4bd7a34 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.0")] +[assembly: AssemblyVersion("3.1.260")] From 9ca0c04ee726d4a4972e871865f2c272035d8660 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 21 Dec 2016 15:24:55 -0500 Subject: [PATCH 03/14] 3.1.1 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index aa4bd7a34..d5d62302e 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.260")] +[assembly: AssemblyVersion("3.1.1")] From e47ccdce4247b93faa6d27849b255aac83324c42 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 28 Dec 2016 16:13:01 -0500 Subject: [PATCH 04/14] fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index d5d62302e..c082f5664 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.1")] +[assembly: AssemblyVersion("3.1.265")] From 60c71f0d571661d9cc33e1792ea3ff6788b71427 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 28 Dec 2016 16:13:43 -0500 Subject: [PATCH 05/14] 3.1.2 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index c082f5664..81cccbf50 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.265")] +[assembly: AssemblyVersion("3.1.2")] From 0d0e4ad695f3657d7ca3eef1ed54fe8608a490a1 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 26 Jan 2017 15:40:00 -0500 Subject: [PATCH 06/14] fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 81cccbf50..a84946b89 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.2")] +[assembly: AssemblyVersion("3.1.286")] From 85fd32cc81cdf2d4d5752a0f8b85d2501c2028d7 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 26 Jan 2017 15:41:03 -0500 Subject: [PATCH 07/14] 3.1.3 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index a84946b89..95e75e8d2 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.286")] +[assembly: AssemblyVersion("3.1.3")] From fb892d8b927417a05ddb9e0fd7825e02af045e1b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 26 Jan 2017 23:02:16 -0500 Subject: [PATCH 08/14] 3.1.4 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 95e75e8d2..331fd710f 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.3")] +[assembly: AssemblyVersion("3.1.4")] From b40250045ab478f3ca29951457084d118ce1a26d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 27 Jan 2017 15:50:31 -0500 Subject: [PATCH 09/14] 3.1.5 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 331fd710f..e62c8563a 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.4")] +[assembly: AssemblyVersion("3.1.5")] From 84d2a5303b2eee311628876851335b7b926aa2ea Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 6 Feb 2017 01:08:09 -0500 Subject: [PATCH 10/14] fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index e62c8563a..05eb1febb 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.5")] +[assembly: AssemblyVersion("3.1.295")] From 1bf1cfda892e97ff76ff25934ce44c7d4c565af4 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 6 Feb 2017 01:09:54 -0500 Subject: [PATCH 11/14] 3.2 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 05eb1febb..d1a774c2f 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.295")] +[assembly: AssemblyVersion("3.2.0")] From 345a619d934432f6f91aa716989d34abebaec117 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 6 Feb 2017 13:45:24 -0500 Subject: [PATCH 12/14] update mac project --- .../Emby.Server.Mac.csproj | 828 +----------------- 1 file changed, 6 insertions(+), 822 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 85c7533a7..7f3baf0c0 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -576,39 +576,12 @@ Resources\dashboard-ui\wizarduser.html - - Resources\dashboard-ui\bower_components\Sortable\.bower.json - - - Resources\dashboard-ui\bower_components\Sortable\.editorconfig - - - Resources\dashboard-ui\bower_components\Sortable\.gitignore - - - Resources\dashboard-ui\bower_components\Sortable\.jshintrc - - - Resources\dashboard-ui\bower_components\Sortable\CONTRIBUTING.md - - - Resources\dashboard-ui\bower_components\Sortable\Gruntfile.js - - - Resources\dashboard-ui\bower_components\Sortable\README.md - Resources\dashboard-ui\bower_components\Sortable\Sortable.html Resources\dashboard-ui\bower_components\Sortable\Sortable.min.js - - Resources\dashboard-ui\bower_components\Sortable\bower.json - - - Resources\dashboard-ui\bower_components\Sortable\component.json - Resources\dashboard-ui\bower_components\Sortable\index.html @@ -621,30 +594,12 @@ Resources\dashboard-ui\bower_components\Sortable\ng-sortable.js - - Resources\dashboard-ui\bower_components\Sortable\package.json - Resources\dashboard-ui\bower_components\Sortable\react-sortable-mixin.js - - Resources\dashboard-ui\bower_components\Swiper\.bower.json - - - Resources\dashboard-ui\bower_components\Swiper\CHANGELOG.md - Resources\dashboard-ui\bower_components\Swiper\LICENSE - - Resources\dashboard-ui\bower_components\Swiper\README.md - - - Resources\dashboard-ui\bower_components\Swiper\bower.json - - - Resources\dashboard-ui\bower_components\Swiper\component.json - Resources\dashboard-ui\bower_components\Swiper\gulpfile.js @@ -657,261 +612,24 @@ Resources\dashboard-ui\bower_components\Swiper\dist\js\swiper.min.js - - Resources\dashboard-ui\bower_components\cryptojslib\.bower.json - - - Resources\dashboard-ui\bower_components\cryptojslib\.gitattributes - - - Resources\dashboard-ui\bower_components\cryptojslib\.gitignore - - - Resources\dashboard-ui\bower_components\cryptojslib\README.md - - - Resources\dashboard-ui\bower_components\cryptojslib\bower.json - - - Resources\dashboard-ui\bower_components\cryptojslib\copyright.txt - - - Resources\dashboard-ui\bower_components\cryptojslib\push.bat - - - Resources\dashboard-ui\bower_components\cryptojslib\status.bat - - - Resources\dashboard-ui\bower_components\cryptojslib\components\aes-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\aes.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\cipher-core-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\cipher-core.js - Resources\dashboard-ui\bower_components\cryptojslib\components\core-min.js - - Resources\dashboard-ui\bower_components\cryptojslib\components\core.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\enc-base64-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\enc-base64.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\enc-utf16-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\enc-utf16.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\evpkdf-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\evpkdf.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\format-hex-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\format-hex.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\hmac-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\hmac.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\lib-typedarrays-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\lib-typedarrays.js - Resources\dashboard-ui\bower_components\cryptojslib\components\md5-min.js - - Resources\dashboard-ui\bower_components\cryptojslib\components\md5.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\mode-cfb-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\mode-cfb.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\mode-ctr-gladman-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\mode-ctr-gladman.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\mode-ctr-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\mode-ctr.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\mode-ecb-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\mode-ecb.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\mode-ofb-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\mode-ofb.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\pad-ansix923-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\pad-ansix923.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\pad-iso10126-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\pad-iso10126.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\pad-iso97971-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\pad-iso97971.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\pad-nopadding-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\pad-nopadding.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\pad-zeropadding-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\pad-zeropadding.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\pbkdf2-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\pbkdf2.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\rabbit-legacy-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\rabbit-legacy.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\rabbit-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\rabbit.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\rc4-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\rc4.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\ripemd160-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\ripemd160.js - Resources\dashboard-ui\bower_components\cryptojslib\components\sha1-min.js - - Resources\dashboard-ui\bower_components\cryptojslib\components\sha1.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\sha224-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\sha224.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\sha256-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\sha256.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\sha3-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\sha3.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\sha384-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\sha384.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\sha512-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\sha512.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\tripledes-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\tripledes.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\x64-core-min.js - - - Resources\dashboard-ui\bower_components\cryptojslib\components\x64-core.js - - - Resources\dashboard-ui\bower_components\document-register-element\.bower.json - - - Resources\dashboard-ui\bower_components\document-register-element\LICENSE.txt - - - Resources\dashboard-ui\bower_components\document-register-element\README.md - - - Resources\dashboard-ui\bower_components\document-register-element\RESOURCES.md - Resources\dashboard-ui\bower_components\document-register-element\basic.html - - Resources\dashboard-ui\bower_components\document-register-element\bower.json - Resources\dashboard-ui\bower_components\document-register-element\testrunner.js Resources\dashboard-ui\bower_components\document-register-element\build\document-register-element.js - - Resources\dashboard-ui\bower_components\emby-apiclient\.bower.json - - - Resources\dashboard-ui\bower_components\emby-apiclient\LICENSE.md - - - Resources\dashboard-ui\bower_components\emby-apiclient\README.md - Resources\dashboard-ui\bower_components\emby-apiclient\apiclient.js @@ -927,9 +645,6 @@ Resources\dashboard-ui\bower_components\emby-apiclient\appstorage-memory.js - - Resources\dashboard-ui\bower_components\emby-apiclient\bower.json - Resources\dashboard-ui\bower_components\emby-apiclient\cameraroll.js @@ -996,21 +711,9 @@ Resources\dashboard-ui\bower_components\emby-apiclient\sync\userrepository.js - - Resources\dashboard-ui\bower_components\emby-webcomponents\.bower.json - - - Resources\dashboard-ui\bower_components\emby-webcomponents\LICENSE.md - - - Resources\dashboard-ui\bower_components\emby-webcomponents\README.md - Resources\dashboard-ui\bower_components\emby-webcomponents\appsettings.js - - Resources\dashboard-ui\bower_components\emby-webcomponents\bower.json - Resources\dashboard-ui\bower_components\emby-webcomponents\browser.js @@ -1041,6 +744,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\filesystem.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\flexstyles.css + Resources\dashboard-ui\bower_components\emby-webcomponents\focusmanager.js @@ -1467,9 +1173,6 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\multiselect\multiselect.js - - Resources\dashboard-ui\bower_components\emby-webcomponents\native-promise-only\README.md - Resources\dashboard-ui\bower_components\emby-webcomponents\native-promise-only\test_adapter.js @@ -1488,6 +1191,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\pagejs\page.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\playback\autoplaydetect.js + Resources\dashboard-ui\bower_components\emby-webcomponents\playback\nowplayinghelper.js @@ -1608,9 +1314,6 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\sharing\social-share-kit-1.0.10\LICENSE - - Resources\dashboard-ui\bower_components\emby-webcomponents\sharing\social-share-kit-1.0.10\README.md - Resources\dashboard-ui\bower_components\emby-webcomponents\sharing\social-share-kit-1.0.10\dist\css\social-share-kit.css @@ -1806,9 +1509,6 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\viewmanager\viewmanager.js - - Resources\dashboard-ui\bower_components\emby-webcomponents\voice\Readme.md - Resources\dashboard-ui\bower_components\emby-webcomponents\voice\grammarprocessor.js @@ -1860,48 +1560,15 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\youtubeplayer\style.css - - Resources\dashboard-ui\bower_components\fetch\.bower.json - Resources\dashboard-ui\bower_components\fetch\LICENSE - - Resources\dashboard-ui\bower_components\fetch\bower.json - Resources\dashboard-ui\bower_components\fetch\fetch.js - - Resources\dashboard-ui\bower_components\font-roboto\.bower.json - - - Resources\dashboard-ui\bower_components\font-roboto\README.md - - - Resources\dashboard-ui\bower_components\font-roboto\bower.json - Resources\dashboard-ui\bower_components\font-roboto\roboto.html - - Resources\dashboard-ui\bower_components\hammerjs\.bower.json - - - Resources\dashboard-ui\bower_components\hammerjs\CHANGELOG.md - - - Resources\dashboard-ui\bower_components\hammerjs\CONTRIBUTING.md - - - Resources\dashboard-ui\bower_components\hammerjs\LICENSE.md - - - Resources\dashboard-ui\bower_components\hammerjs\README.md - - - Resources\dashboard-ui\bower_components\hammerjs\bower.json - Resources\dashboard-ui\bower_components\hammerjs\changelog.js @@ -1911,27 +1578,9 @@ Resources\dashboard-ui\bower_components\hammerjs\hammer.min.js - - Resources\dashboard-ui\bower_components\hammerjs\hammer.min.js.map - - - Resources\dashboard-ui\bower_components\hammerjs\hammer.min.map - - - Resources\dashboard-ui\bower_components\headroomjs\.bower.json - Resources\dashboard-ui\bower_components\headroomjs\LICENSE - - Resources\dashboard-ui\bower_components\headroomjs\README.md - - - Resources\dashboard-ui\bower_components\headroomjs\bower.json - - - Resources\dashboard-ui\bower_components\headroomjs\package.json - Resources\dashboard-ui\bower_components\headroomjs\dist\angular.headroom.js @@ -1950,75 +1599,18 @@ Resources\dashboard-ui\bower_components\headroomjs\dist\jQuery.headroom.min.js - - Resources\dashboard-ui\bower_components\hlsjs\.bower.json - - - Resources\dashboard-ui\bower_components\hlsjs\API.md - - - Resources\dashboard-ui\bower_components\hlsjs\CONTRIBUTING.md - - - Resources\dashboard-ui\bower_components\hlsjs\ISSUE_TEMPLATE.md - Resources\dashboard-ui\bower_components\hlsjs\LICENSE - - Resources\dashboard-ui\bower_components\hlsjs\README.md - - - Resources\dashboard-ui\bower_components\hlsjs\bower.json - - - Resources\dashboard-ui\bower_components\hlsjs\design.md - Resources\dashboard-ui\bower_components\hlsjs\hls.js.sublime-project - - Resources\dashboard-ui\bower_components\hlsjs\package.json - Resources\dashboard-ui\bower_components\hlsjs\dist\hls.min.js - - Resources\dashboard-ui\bower_components\howlerjs\.bower.json - - - Resources\dashboard-ui\bower_components\howlerjs\CHANGELOG.md - - - Resources\dashboard-ui\bower_components\howlerjs\LICENSE.md - - - Resources\dashboard-ui\bower_components\howlerjs\README.md - - - Resources\dashboard-ui\bower_components\howlerjs\bower.json - Resources\dashboard-ui\bower_components\howlerjs\howler.min.js - - Resources\dashboard-ui\bower_components\howlerjs\package.json - - - Resources\dashboard-ui\bower_components\jquery\.bower.json - - - Resources\dashboard-ui\bower_components\jquery\AUTHORS.txt - - - Resources\dashboard-ui\bower_components\jquery\LICENSE.txt - - - Resources\dashboard-ui\bower_components\jquery\README.md - - - Resources\dashboard-ui\bower_components\jquery\bower.json - Resources\dashboard-ui\bower_components\jquery\dist\core.js @@ -2028,240 +1620,15 @@ Resources\dashboard-ui\bower_components\jquery\dist\jquery.min.js - - Resources\dashboard-ui\bower_components\jquery\dist\jquery.min.map - Resources\dashboard-ui\bower_components\jquery\dist\jquery.slim.js Resources\dashboard-ui\bower_components\jquery\dist\jquery.slim.min.js - - Resources\dashboard-ui\bower_components\jquery\dist\jquery.slim.min.map - - - Resources\dashboard-ui\bower_components\jquery\external\sizzle\LICENSE.txt - - - Resources\dashboard-ui\bower_components\jquery\external\sizzle\dist\sizzle.js - - - Resources\dashboard-ui\bower_components\jquery\external\sizzle\dist\sizzle.min.js - - - Resources\dashboard-ui\bower_components\jquery\external\sizzle\dist\sizzle.min.map - - - Resources\dashboard-ui\bower_components\jquery\src\.eslintrc.json - - - Resources\dashboard-ui\bower_components\jquery\src\ajax.js - - - Resources\dashboard-ui\bower_components\jquery\src\attributes.js - - - Resources\dashboard-ui\bower_components\jquery\src\callbacks.js - - - Resources\dashboard-ui\bower_components\jquery\src\core.js - - - Resources\dashboard-ui\bower_components\jquery\src\css.js - - - Resources\dashboard-ui\bower_components\jquery\src\data.js - - - Resources\dashboard-ui\bower_components\jquery\src\deferred.js - - - Resources\dashboard-ui\bower_components\jquery\src\deprecated.js - - - Resources\dashboard-ui\bower_components\jquery\src\dimensions.js - - - Resources\dashboard-ui\bower_components\jquery\src\effects.js - - - Resources\dashboard-ui\bower_components\jquery\src\event.js - - - Resources\dashboard-ui\bower_components\jquery\src\jquery.js - - - Resources\dashboard-ui\bower_components\jquery\src\manipulation.js - - - Resources\dashboard-ui\bower_components\jquery\src\offset.js - - - Resources\dashboard-ui\bower_components\jquery\src\queue.js - - - Resources\dashboard-ui\bower_components\jquery\src\selector-native.js - - - Resources\dashboard-ui\bower_components\jquery\src\selector-sizzle.js - - - Resources\dashboard-ui\bower_components\jquery\src\selector.js - - - Resources\dashboard-ui\bower_components\jquery\src\serialize.js - - - Resources\dashboard-ui\bower_components\jquery\src\traversing.js - - - Resources\dashboard-ui\bower_components\jquery\src\wrap.js - - - Resources\dashboard-ui\bower_components\jquery\src\ajax\jsonp.js - - - Resources\dashboard-ui\bower_components\jquery\src\ajax\load.js - - - Resources\dashboard-ui\bower_components\jquery\src\ajax\parseXML.js - - - Resources\dashboard-ui\bower_components\jquery\src\ajax\script.js - - - Resources\dashboard-ui\bower_components\jquery\src\ajax\xhr.js - - - Resources\dashboard-ui\bower_components\jquery\src\attributes\attr.js - - - Resources\dashboard-ui\bower_components\jquery\src\attributes\classes.js - - - Resources\dashboard-ui\bower_components\jquery\src\attributes\prop.js - - - Resources\dashboard-ui\bower_components\jquery\src\attributes\support.js - - - Resources\dashboard-ui\bower_components\jquery\src\attributes\val.js - - - Resources\dashboard-ui\bower_components\jquery\src\core\DOMEval.js - - - Resources\dashboard-ui\bower_components\jquery\src\core\access.js - - - Resources\dashboard-ui\bower_components\jquery\src\core\init.js - - - Resources\dashboard-ui\bower_components\jquery\src\core\parseHTML.js - - - Resources\dashboard-ui\bower_components\jquery\src\core\ready-no-deferred.js - - - Resources\dashboard-ui\bower_components\jquery\src\core\ready.js - - - Resources\dashboard-ui\bower_components\jquery\src\core\readyException.js - - - Resources\dashboard-ui\bower_components\jquery\src\core\stripAndCollapse.js - - - Resources\dashboard-ui\bower_components\jquery\src\core\support.js - - - Resources\dashboard-ui\bower_components\jquery\src\css\addGetHookIf.js - - - Resources\dashboard-ui\bower_components\jquery\src\css\adjustCSS.js - - - Resources\dashboard-ui\bower_components\jquery\src\css\curCSS.js - - - Resources\dashboard-ui\bower_components\jquery\src\css\hiddenVisibleSelectors.js - - - Resources\dashboard-ui\bower_components\jquery\src\css\showHide.js - - - Resources\dashboard-ui\bower_components\jquery\src\css\support.js - - - Resources\dashboard-ui\bower_components\jquery\src\data\Data.js - - - Resources\dashboard-ui\bower_components\jquery\src\deferred\exceptionHook.js - - - Resources\dashboard-ui\bower_components\jquery\src\effects\Tween.js - - - Resources\dashboard-ui\bower_components\jquery\src\effects\animatedSelector.js - - - Resources\dashboard-ui\bower_components\jquery\src\event\ajax.js - - - Resources\dashboard-ui\bower_components\jquery\src\event\alias.js - - - Resources\dashboard-ui\bower_components\jquery\src\event\focusin.js - - - Resources\dashboard-ui\bower_components\jquery\src\event\support.js - - - Resources\dashboard-ui\bower_components\jquery\src\event\trigger.js - - - Resources\dashboard-ui\bower_components\jquery\src\exports\amd.js - - - Resources\dashboard-ui\bower_components\jquery\src\exports\global.js - - - Resources\dashboard-ui\bower_components\jquery\src\manipulation\_evalUrl.js - - - Resources\dashboard-ui\bower_components\jquery\src\manipulation\buildFragment.js - - - Resources\dashboard-ui\bower_components\jquery\src\manipulation\getAll.js - - - Resources\dashboard-ui\bower_components\jquery\src\manipulation\setGlobalEval.js - - - Resources\dashboard-ui\bower_components\jquery\src\manipulation\support.js - - - Resources\dashboard-ui\bower_components\jquery\src\manipulation\wrapMap.js - - - Resources\dashboard-ui\bower_components\jquery\src\queue\delay.js - - - Resources\dashboard-ui\bower_components\jquery\src\traversing\findFilter.js - - - Resources\dashboard-ui\bower_components\jstree\.bower.json - Resources\dashboard-ui\bower_components\jstree\LICENSE-MIT - - Resources\dashboard-ui\bower_components\jstree\bower.json - - - Resources\dashboard-ui\bower_components\jstree\composer.json - Resources\dashboard-ui\bower_components\jstree\dist\jstree.js @@ -2298,195 +1665,36 @@ Resources\dashboard-ui\bower_components\jstree\dist\themes\default-dark\throbber.gif - - Resources\dashboard-ui\bower_components\jstree\src\intro.js - - - Resources\dashboard-ui\bower_components\jstree\src\jstree.checkbox.js - - - Resources\dashboard-ui\bower_components\jstree\src\jstree.contextmenu.js - - - Resources\dashboard-ui\bower_components\jstree\src\jstree.dnd.js - - - Resources\dashboard-ui\bower_components\jstree\src\jstree.js - - - Resources\dashboard-ui\bower_components\jstree\src\jstree.massload.js - - - Resources\dashboard-ui\bower_components\jstree\src\jstree.search.js - - - Resources\dashboard-ui\bower_components\jstree\src\jstree.sort.js - - - Resources\dashboard-ui\bower_components\jstree\src\jstree.state.js - - - Resources\dashboard-ui\bower_components\jstree\src\jstree.types.js - - - Resources\dashboard-ui\bower_components\jstree\src\jstree.unique.js - - - Resources\dashboard-ui\bower_components\jstree\src\jstree.wholerow.js - - - Resources\dashboard-ui\bower_components\jstree\src\misc.js - - - Resources\dashboard-ui\bower_components\jstree\src\outro.js - - - Resources\dashboard-ui\bower_components\jstree\src\sample.js - - - Resources\dashboard-ui\bower_components\jstree\src\vakata-jstree.js - - - Resources\dashboard-ui\bower_components\jstree\src\themes\base.less - - - Resources\dashboard-ui\bower_components\jstree\src\themes\main.less - - - Resources\dashboard-ui\bower_components\jstree\src\themes\mixins.less - - - Resources\dashboard-ui\bower_components\jstree\src\themes\responsive.less - - - Resources\dashboard-ui\bower_components\jstree\src\themes\default\32px.png - - - Resources\dashboard-ui\bower_components\jstree\src\themes\default\40px.png - - - Resources\dashboard-ui\bower_components\jstree\src\themes\default\style.css - - - Resources\dashboard-ui\bower_components\jstree\src\themes\default\style.less - - - Resources\dashboard-ui\bower_components\jstree\src\themes\default\throbber.gif - - - Resources\dashboard-ui\bower_components\jstree\src\themes\default-dark\32px.png - - - Resources\dashboard-ui\bower_components\jstree\src\themes\default-dark\40px.png - - - Resources\dashboard-ui\bower_components\jstree\src\themes\default-dark\style.css - - - Resources\dashboard-ui\bower_components\jstree\src\themes\default-dark\style.less - - - Resources\dashboard-ui\bower_components\jstree\src\themes\default-dark\throbber.gif - - - Resources\dashboard-ui\bower_components\libjass\.bower.json - - - Resources\dashboard-ui\bower_components\libjass\CHANGELOG.md - Resources\dashboard-ui\bower_components\libjass\LICENSE - - Resources\dashboard-ui\bower_components\libjass\README.md - Resources\dashboard-ui\bower_components\libjass\libjass.css Resources\dashboard-ui\bower_components\libjass\libjass.min.js - - Resources\dashboard-ui\bower_components\libjass\package.json - - - Resources\dashboard-ui\bower_components\query-string\.bower.json - - - Resources\dashboard-ui\bower_components\query-string\.editorconfig - - - Resources\dashboard-ui\bower_components\query-string\.gitattributes - - - Resources\dashboard-ui\bower_components\query-string\.gitignore - - - Resources\dashboard-ui\bower_components\query-string\.jshintrc - - - Resources\dashboard-ui\bower_components\query-string\.travis.yml - Resources\dashboard-ui\bower_components\query-string\index.js Resources\dashboard-ui\bower_components\query-string\license - - Resources\dashboard-ui\bower_components\query-string\package.json - - - Resources\dashboard-ui\bower_components\query-string\readme.md - Resources\dashboard-ui\bower_components\query-string\test.js - - Resources\dashboard-ui\bower_components\query-string\test\extract.js - - - Resources\dashboard-ui\bower_components\query-string\test\parse.js - - - Resources\dashboard-ui\bower_components\query-string\test\stringify.js - - - Resources\dashboard-ui\bower_components\requirejs\.bower.json - Resources\dashboard-ui\bower_components\requirejs\LICENSE - - Resources\dashboard-ui\bower_components\requirejs\README.md - - - Resources\dashboard-ui\bower_components\requirejs\bower.json - Resources\dashboard-ui\bower_components\requirejs\require.js - - Resources\dashboard-ui\bower_components\vibrant\.bower.json - - - Resources\dashboard-ui\bower_components\vibrant\LICENSE.md - - - Resources\dashboard-ui\bower_components\vibrant\README.md - - - Resources\dashboard-ui\bower_components\vibrant\bower.json - Resources\dashboard-ui\bower_components\vibrant\gulpfile.coffee Resources\dashboard-ui\bower_components\vibrant\index.html - - Resources\dashboard-ui\bower_components\vibrant\package.json - Resources\dashboard-ui\bower_components\vibrant\style.css @@ -2499,21 +1707,9 @@ Resources\dashboard-ui\bower_components\vibrant\dist\vibrant.min.js - - Resources\dashboard-ui\bower_components\web-animations-js\.bower.json - Resources\dashboard-ui\bower_components\web-animations-js\COPYING - - Resources\dashboard-ui\bower_components\web-animations-js\History.md - - - Resources\dashboard-ui\bower_components\web-animations-js\README.md - - - Resources\dashboard-ui\bower_components\web-animations-js\bower.json - Resources\dashboard-ui\bower_components\web-animations-js\web-animations-next-lite.min.js @@ -2526,18 +1722,6 @@ Resources\dashboard-ui\bower_components\web-animations-js\web-animations.min.js - - Resources\dashboard-ui\bower_components\webcomponentsjs\.bower.json - - - Resources\dashboard-ui\bower_components\webcomponentsjs\README.md - - - Resources\dashboard-ui\bower_components\webcomponentsjs\bower.json - - - Resources\dashboard-ui\bower_components\webcomponentsjs\package.json - Resources\dashboard-ui\bower_components\webcomponentsjs\webcomponents-lite.min.js From 7fdd180b20fab8a49c89edf64f3bb529e517c5a9 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 9 Feb 2017 19:38:12 -0500 Subject: [PATCH 13/14] fix merge conflict --- SharedVersion.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index d1a774c2f..7a98bd22e 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,3 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.2.0")] +[assembly: AssemblyVersion("3.2.1.100")] From 926b7fd42d0738f3afc39d6ab353535bb9fb948c Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 9 Feb 2017 19:38:58 -0500 Subject: [PATCH 14/14] fix merge conflict --- MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 7f3baf0c0..f7f084917 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -1569,15 +1569,6 @@ Resources\dashboard-ui\bower_components\font-roboto\roboto.html - - Resources\dashboard-ui\bower_components\hammerjs\changelog.js - - - Resources\dashboard-ui\bower_components\hammerjs\hammer.js - - - Resources\dashboard-ui\bower_components\hammerjs\hammer.min.js - Resources\dashboard-ui\bower_components\headroomjs\LICENSE @@ -1917,6 +1908,9 @@ Resources\dashboard-ui\css\images\logo.png + + Resources\dashboard-ui\css\images\logoblack.png + Resources\dashboard-ui\css\images\mblogoicon.png