diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-05-26 10:52:11 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-05-26 10:52:11 -0400 |
| commit | a16655e22e928cb480edf022b7c5b47d709de958 (patch) | |
| tree | 1bc28d9339708200f9731d4e08a8eea17456b37c | |
| parent | e57deb61ae1e0deef6b29f015fcfdbec382421e0 (diff) | |
use utc for premieredate
3 files changed, 8 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Extensions/XmlExtensions.cs b/MediaBrowser.Controller/Extensions/XmlExtensions.cs index d28febe7c..ce689e47d 100644 --- a/MediaBrowser.Controller/Extensions/XmlExtensions.cs +++ b/MediaBrowser.Controller/Extensions/XmlExtensions.cs @@ -135,7 +135,7 @@ namespace MediaBrowser.Controller.Extensions var text = rvalNode.InnerText; DateTime date; if (DateTime.TryParse(text, out date)) - return date; + return date.ToUniversalTime(); } return defaultDate; } diff --git a/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs index d7b2c2a34..aaa76a20c 100644 --- a/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs +++ b/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs @@ -376,7 +376,7 @@ namespace MediaBrowser.Controller.Providers.TV series.AirDays = TVUtils.GetAirDays(doc.SafeGetString("//Airs_DayOfWeek")); series.AirTime = doc.SafeGetString("//Airs_Time"); SeriesStatus seriesStatus; - if(Enum.TryParse(doc.SafeGetString("//Status"), out seriesStatus)) + if(Enum.TryParse(doc.SafeGetString("//Status"), true, out seriesStatus)) series.Status = seriesStatus; series.PremiereDate = doc.SafeGetDateTime("//FirstAired"); if (series.PremiereDate.HasValue) diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index fefa9b177..ad0e77bb1 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -114,6 +114,9 @@ <Content Include="dashboard-ui\css\images\items\searchhints\tv.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\css\images\media\audioflyout.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\css\images\media\audiotrack.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -132,6 +135,9 @@ <Content Include="dashboard-ui\css\images\media\settings.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\css\images\media\subtitleflyout.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\css\images\media\subtitles.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
|