diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-06-25 17:50:56 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-06-25 17:50:56 -0400 |
| commit | 0b721f2e056f00fd16fc057405796bdb83297e45 (patch) | |
| tree | e21ff39a270177ff31c449fc862d2791526b3af6 | |
| parent | f511cb70ad8de9adbb267bc80a693d2e74b330ac (diff) | |
fix video player time display
| -rw-r--r-- | MediaBrowser.Api/BaseApiService.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/PackageCreator.cs | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index 70f329946..564cfa93a 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -362,7 +362,8 @@ namespace MediaBrowser.Api var first = pathInfo.GetArgumentValue<string>(0); // backwards compatibility - if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) || + string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase)) { index++; } diff --git a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs index f9184f6d1..0da34efc6 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs @@ -33,7 +33,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer if (_denyIframeEmbedding()) { - res.AddHeader("X-Frame-Options", "DENY"); + res.AddHeader("X-Frame-Options", "SAMEORIGIN"); } var exception = dto as Exception; diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index f29807890..9764fe612 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -657,8 +657,6 @@ namespace MediaBrowser.WebDashboard.Api "librarymenu.css", "librarybrowser.css", "card.css", - "tileitem.css", - "metadataeditor.css", "notifications.css", "search.css", "pluginupdates.css", |