From 8d9fb0c265b1c67faa4fbcb37b946e0c4cc3e776 Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 9 Sep 2016 16:15:39 -0400 Subject: [PATCH 1/2] update mac project --- .../Emby.Server.Mac.csproj | 59 ++++++++++++++----- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index f04b833b90..9f3bf5102f 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -498,9 +498,6 @@ Resources\dashboard-ui\livetvitems.html - - Resources\dashboard-ui\livetvrecordinglist.html - Resources\dashboard-ui\livetvseriestimer.html @@ -1050,6 +1047,9 @@ Resources\dashboard-ui\bower_components\emby-apiclient\serverdiscovery-chrome.js + + Resources\dashboard-ui\bower_components\emby-apiclient\serverdiscovery-winjs.js + Resources\dashboard-ui\bower_components\emby-apiclient\serverdiscovery.js @@ -1215,6 +1215,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\dialog\dialog.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\dialog\dialog.template.html + Resources\dashboard-ui\bower_components\emby-webcomponents\dialoghelper\dialoghelper.css @@ -1470,6 +1473,18 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\ty9dfvLAziwdqQ2dHoyjphTbgVql8nDJpwnrE27mub0.woff2 + + Resources\dashboard-ui\bower_components\emby-webcomponents\fullscreen\fullscreen-doubleclick.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\fullscreen\fullscreenmanager.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\guide\guide-settings.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\guide\guide-settings.template.html + Resources\dashboard-ui\bower_components\emby-webcomponents\guide\guide.css @@ -1479,6 +1494,12 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\guide\tvguide.template.html + + Resources\dashboard-ui\bower_components\emby-webcomponents\imageeditor\imageeditor.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\imageeditor\imageeditor.template.html + Resources\dashboard-ui\bower_components\emby-webcomponents\images\basicimagefetcher.js @@ -1557,14 +1578,17 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\multiselect\multiselect.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\notifications\badge.png + 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 + + Resources\dashboard-ui\bower_components\emby-webcomponents\pagejs\page.js Resources\dashboard-ui\bower_components\emby-webcomponents\playlisteditor\playlisteditor.js @@ -1578,14 +1602,17 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\polyfills\objectassign.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\polyfills\raf.js + Resources\dashboard-ui\bower_components\emby-webcomponents\prompt\nativeprompt.js Resources\dashboard-ui\bower_components\emby-webcomponents\prompt\prompt.js - - Resources\dashboard-ui\bower_components\emby-webcomponents\prompt\style.css + + Resources\dashboard-ui\bower_components\emby-webcomponents\prompt\prompt.template.html Resources\dashboard-ui\bower_components\emby-webcomponents\recordingcreator\recordingcreator.css @@ -1617,6 +1644,12 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\scroller\smoothscroller.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\serviceworker\notifications.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\serviceworker\sync.js + Resources\dashboard-ui\bower_components\emby-webcomponents\sharing\sharingmanager.js @@ -3423,12 +3456,6 @@ Resources\dashboard-ui\components\imagedownloader\imagedownloader.template.html - - Resources\dashboard-ui\components\imageeditor\imageeditor.js - - - Resources\dashboard-ui\components\imageeditor\imageeditor.template.html - Resources\dashboard-ui\components\imageuploader\imageuploader.js @@ -3936,12 +3963,12 @@ Resources\dashboard-ui\scripts\livetvitems.js - - Resources\dashboard-ui\scripts\livetvrecordinglist.js - Resources\dashboard-ui\scripts\livetvrecordings.js + + Resources\dashboard-ui\scripts\livetvschedule.js + Resources\dashboard-ui\scripts\livetvseriestimer.js From 5192e8a6d2412b8e0179be23da79dffb0b3e5847 Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 9 Sep 2016 16:18:22 -0400 Subject: [PATCH 2/2] update mac project --- MediaBrowser.Server.Mac/Native/BaseMonoApp.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs index 7c9b43026a..f4e0544066 100644 --- a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs @@ -205,6 +205,16 @@ namespace MediaBrowser.Server.Mac return new NullPowerManagement (); } + public void EnableLoopback(string appName) + { + + } + + public bool PortsRequireAuthorization(string applicationPath) + { + return false; + } + private NativeEnvironment GetEnvironmentInfo() { var info = new NativeEnvironment