From 154404624e7d702fb95290d9ee6a1bc22c471021 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 6 Apr 2015 01:01:53 -0400 Subject: [PATCH 1/8] add image magick mac files --- MediaBrowser.Server.Mac/ImageMagickSharp.dll.config | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 MediaBrowser.Server.Mac/ImageMagickSharp.dll.config diff --git a/MediaBrowser.Server.Mac/ImageMagickSharp.dll.config b/MediaBrowser.Server.Mac/ImageMagickSharp.dll.config new file mode 100644 index 000000000..a94e8acb8 --- /dev/null +++ b/MediaBrowser.Server.Mac/ImageMagickSharp.dll.config @@ -0,0 +1,3 @@ + + + \ No newline at end of file From e9d7b3b18ac430edb4c846d6ad2e1206bac18498 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 6 Apr 2015 01:14:16 -0400 Subject: [PATCH 2/8] update mac project --- .../Imazen.WebP.dll.config | 3 - .../MediaBrowser.Server.Mac.csproj | 65 ++++++++++++------- 2 files changed, 43 insertions(+), 25 deletions(-) delete mode 100644 MediaBrowser.Server.Mac/Imazen.WebP.dll.config diff --git a/MediaBrowser.Server.Mac/Imazen.WebP.dll.config b/MediaBrowser.Server.Mac/Imazen.WebP.dll.config deleted file mode 100644 index 1b6270fd5..000000000 --- a/MediaBrowser.Server.Mac/Imazen.WebP.dll.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj index 66a0897a5..34ee2bee9 100644 --- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj @@ -110,10 +110,8 @@ PreserveNewest - - PreserveNewest - + @@ -186,10 +184,6 @@ False Dynamic - - False - Dynamic - False Dynamic @@ -271,6 +265,9 @@ Resources\dashboard-ui\advanced.html + + Resources\dashboard-ui\appservices.html + Resources\dashboard-ui\autoorganizelog.html @@ -388,6 +385,9 @@ Resources\dashboard-ui\itemlist.html + + Resources\dashboard-ui\kids.html + Resources\dashboard-ui\library.html @@ -406,6 +406,9 @@ Resources\dashboard-ui\livetvguide.html + + Resources\dashboard-ui\livetvitems.html + Resources\dashboard-ui\livetvnewrecording.html @@ -535,9 +538,6 @@ Resources\dashboard-ui\playbackconfiguration.html - - Resources\dashboard-ui\playlist.html - Resources\dashboard-ui\playlistedit.html @@ -706,6 +706,9 @@ Resources\dashboard-ui\css\userimage.css + + Resources\dashboard-ui\css\fonts\Montserrat.woff + Resources\dashboard-ui\css\fonts\RobotoBold.woff @@ -721,9 +724,6 @@ Resources\dashboard-ui\css\fonts\RobotoThin.woff - - Resources\dashboard-ui\css\fonts\mblogo.woff - Resources\dashboard-ui\css\images\checkmarkblack.png @@ -820,6 +820,9 @@ Resources\dashboard-ui\css\images\clients\android.png + + Resources\dashboard-ui\css\images\clients\androidtv-tile.png + Resources\dashboard-ui\css\images\clients\chrome.png @@ -997,6 +1000,9 @@ Resources\dashboard-ui\css\images\items\searchhintsv2\tv.png + + Resources\dashboard-ui\css\images\kids\bg.jpg + Resources\dashboard-ui\css\images\media\chapterflyout.png @@ -1132,6 +1138,9 @@ Resources\dashboard-ui\scripts\alphapicker.js + + Resources\dashboard-ui\scripts\appservices.js + Resources\dashboard-ui\scripts\autoorganizelog.js @@ -1261,6 +1270,9 @@ Resources\dashboard-ui\scripts\itemlistpage.js + + Resources\dashboard-ui\scripts\kids.js + Resources\dashboard-ui\scripts\librarybrowser.js @@ -1285,6 +1297,9 @@ Resources\dashboard-ui\scripts\livetvguide.js + + Resources\dashboard-ui\scripts\livetvitems.js + Resources\dashboard-ui\scripts\livetvnewrecording.js @@ -1429,9 +1444,6 @@ Resources\dashboard-ui\scripts\playbackconfiguration.js - - Resources\dashboard-ui\scripts\playlist.js - Resources\dashboard-ui\scripts\playlistedit.js @@ -1573,6 +1585,9 @@ Resources\dashboard-ui\thirdparty\apiclient\ajax.js + + Resources\dashboard-ui\thirdparty\apiclient\apiclient.js + Resources\dashboard-ui\thirdparty\apiclient\connectionmanager.js @@ -1585,9 +1600,6 @@ Resources\dashboard-ui\thirdparty\apiclient\deferred.js - - Resources\dashboard-ui\thirdparty\apiclient\deferredAlt.js - Resources\dashboard-ui\thirdparty\apiclient\device.js @@ -1600,9 +1612,6 @@ Resources\dashboard-ui\thirdparty\apiclient\md5.js - - Resources\dashboard-ui\thirdparty\apiclient\mediabrowser.apiclient.js - Resources\dashboard-ui\thirdparty\apiclient\network.js @@ -1615,6 +1624,18 @@ Resources\dashboard-ui\thirdparty\apiclient\store.js + + Resources\dashboard-ui\thirdparty\apiclient\alt\ajax.js + + + Resources\dashboard-ui\thirdparty\apiclient\alt\bean.js + + + Resources\dashboard-ui\thirdparty\apiclient\alt\deferred.js + + + Resources\dashboard-ui\thirdparty\apiclient\alt\events.js + Resources\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css From b2c69a244a5585977fe4f62823622afe9d4395d0 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 6 Apr 2015 01:30:32 -0400 Subject: [PATCH 3/8] update mac project --- .../MediaBrowser.Server.Mac.csproj | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj index 34ee2bee9..c6b41f0fe 100644 --- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj @@ -192,6 +192,42 @@ False Dynamic + + False + Dynamic + + + False + Dynamic + + + False + Static + + + False + Dynamic + + + False + Dynamic + + + False + Static + + + False + Dynamic + + + False + Dynamic + + + False + Static + From fa4e65a7b9621d58ee1e01e48de7ead39954e553 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 6 Apr 2015 01:34:45 -0400 Subject: [PATCH 4/8] update mac info.plist --- MediaBrowser.Server.Mac/Info.plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MediaBrowser.Server.Mac/Info.plist b/MediaBrowser.Server.Mac/Info.plist index 3e058c72f..ffb4b31ee 100644 --- a/MediaBrowser.Server.Mac/Info.plist +++ b/MediaBrowser.Server.Mac/Info.plist @@ -2,8 +2,6 @@ - CFBundleDisplayName - Media Browser CFBundleIconFile appicon CFBundleIdentifier @@ -26,5 +24,7 @@ NSApplication NSMainNibFile MainMenu + CFBundleDisplayName + Emby From 33b3eaad14dd705fb0de8c0c21a433cb59377e1e Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 6 Apr 2015 14:53:15 -0400 Subject: [PATCH 5/8] update mac project --- MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj index c6b41f0fe..a31006744 100644 --- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj @@ -111,7 +111,9 @@ PreserveNewest - + + PreserveNewest + From 4733e37c0842a02b4c1917642093f1706df1eaf2 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 8 Apr 2015 11:44:49 -0400 Subject: [PATCH 6/8] remove image magick components --- MediaBrowser.Server.Mac/ImageMagickSharp.dll.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser.Server.Mac/ImageMagickSharp.dll.config b/MediaBrowser.Server.Mac/ImageMagickSharp.dll.config index a94e8acb8..0ad6d1e60 100644 --- a/MediaBrowser.Server.Mac/ImageMagickSharp.dll.config +++ b/MediaBrowser.Server.Mac/ImageMagickSharp.dll.config @@ -1,3 +1,3 @@ - + \ No newline at end of file From 76c2a55570b2f8f994c47758509b1dd0f11bfe34 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 13 Apr 2015 10:26:08 -0400 Subject: [PATCH 7/8] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f024d1e2a..c267c64c8 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,13 @@ It features a REST-based api with built-in documention to facilitate client deve We have several client apps released and in production: - [Android](https://play.google.com/store/apps/details?id=com.mb.android "Android") -- Html5 +- [HTML5](http://app.emby.media "HTML5") - [iPad](https://itunes.apple.com/us/app/media-browser-client/id879475585 "iPad") - [iPhone](https://itunes.apple.com/us/app/media-browser-for-ios/id705058087?mt=8 "iPhone") - [Media Portal](http://www.team-mediaportal.com/ "Media Portal") - [Roku](http://www.roku.com/channels/#!details/44191/media-browser-for-roku "Roku") -- Windows 7/8 Desktop -- Windows Media Center +- [Windows Desktop](http://emby.media/download/ "Windows Desktop") +- [Windows Media Center](http://emby.media/download/ "Windows Media Center") - [Windows Phone](http://www.windowsphone.com/s?appid=f4971ed9-f651-4bf6-84bb-94fd98613b86 "Windows Phone") - [Windows 8](http://apps.microsoft.com/windows/en-us/app/media-browser/ad55a2f0-9897-47bd-8944-bed3aefd5d06 "Windows 8.1") - [Xbmc](http://emby.media/download/ "Xbmc") From 71a4f2761e784513ae2f3dda03aa549903808ebb Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 13 Apr 2015 10:27:16 -0400 Subject: [PATCH 8/8] Update README.md --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c267c64c8..8d8ac63af 100644 --- a/README.md +++ b/README.md @@ -5,19 +5,21 @@ Emby Server is a home media server built on top of other popular open source tec It features a REST-based api with built-in documention to facilitate client development. We also have client libraries for our api to enable rapid development. -We have several client apps released and in production: +## Emby Apps -- [Android](https://play.google.com/store/apps/details?id=com.mb.android "Android") +- [Android (Play Store)](https://play.google.com/store/apps/details?id=com.mb.android "Android (Play Store)") +- [Android (Amazon)](http://www.amazon.com/Emby-for-Android/dp/B00GVH9O0I "Android (Amazon)") +- [Android TV](https://play.google.com/store/apps/details?id=tv.emby.embyatv "Android TV") - [HTML5](http://app.emby.media "HTML5") - [iPad](https://itunes.apple.com/us/app/media-browser-client/id879475585 "iPad") - [iPhone](https://itunes.apple.com/us/app/media-browser-for-ios/id705058087?mt=8 "iPhone") +- [Kodi](http://emby.media/download/ "Kodi") - [Media Portal](http://www.team-mediaportal.com/ "Media Portal") -- [Roku](http://www.roku.com/channels/#!details/44191/media-browser-for-roku "Roku") +- [Roku](https://www.roku.com/channels#!details/44191/emby "Roku") - [Windows Desktop](http://emby.media/download/ "Windows Desktop") - [Windows Media Center](http://emby.media/download/ "Windows Media Center") - [Windows Phone](http://www.windowsphone.com/s?appid=f4971ed9-f651-4bf6-84bb-94fd98613b86 "Windows Phone") - [Windows 8](http://apps.microsoft.com/windows/en-us/app/media-browser/ad55a2f0-9897-47bd-8944-bed3aefd5d06 "Windows 8.1") -- [Xbmc](http://emby.media/download/ "Xbmc") ## New Users ##