michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #2228 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-10-13 11:07:57 -04:00 committed by GitHub
commit cf15c194ae
6 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Model/LiveTv/RecordingStatus.cs
View File

@ -4,7 +4,6 @@ namespace MediaBrowser.Model.LiveTv
public enum RecordingStatus
{
New,
Scheduled,
InProgress,
Completed,
Cancelled,

2
MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@ -100,7 +100,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
container.Adapter = _containerAdapter;
Plugins.RemoveAll(x => x is NativeTypesFeature);
//Plugins.Add(new SwaggerFeature());
Plugins.Add(new SwaggerFeature());
Plugins.Add(new CorsFeature(allowedHeaders: "Content-Type, Authorization, Range, X-MediaBrowser-Token, X-Emby-Authorization"));
//Plugins.Add(new AuthFeature(() => new AuthUserSession(), new IAuthProvider[] {

1
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@ -761,6 +761,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
{
defaults.SeriesId = program.SeriesId;
defaults.ProgramId = program.Id;
defaults.RecordNewOnly = !program.IsRepeat;
}
defaults.SkipEpisodesInLibrary = true;

2
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
View File

@ -112,8 +112,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
}
channel.ImageUrl = FindProperty("tvg-logo", extInf, null);
channel.Number = FindProperty("tvg-id", extInf, channel.Number);
channel.Number = FindProperty("channel-id", extInf, channel.Number);
channel.Number = FindProperty("tvg-id", extInf, channel.Number);
channel.Name = FindProperty("tvg-name", extInf, channel.Name);
channel.Name = FindProperty("tvg-id", extInf, channel.Name);
return channel;

2
MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View File

@ -35,7 +35,7 @@
<UseRefCounting>false</UseRefCounting>
<Profiling>false</Profiling>
<HttpClientHandler>HttpClientHandler</HttpClientHandler>
<TlsProvider>Legacy</TlsProvider>
<TlsProvider>Default</TlsProvider>
<LinkMode>None</LinkMode>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

2
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -1306,7 +1306,7 @@ namespace MediaBrowser.Server.Startup.Common
EncoderLocationType = MediaEncoder.EncoderLocationType,
SystemArchitecture = NativeApp.Environment.SystemArchitecture,
SystemUpdateLevel = ConfigurationManager.CommonConfiguration.SystemUpdateLevel,
PackageName = _startupOptions.GetOption("package")
PackageName = _startupOptions.GetOption("-package")
};
}