alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-31 21:08:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into warn17

Browse Source
This commit is contained in:
Bond-009
2020-03-11 20:26:43 +01:00
committed by GitHub
parent 29cee00d2d 008a76cf4d
commit 94fe9b8f6d
197 changed files with 2620 additions and 2176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Model/Users/UserPolicy.cs
View File

@@ -46,6 +46,7 @@ namespace MediaBrowser.Model.Users
public bool EnableAudioPlaybackTranscoding { get; set; }
public bool EnableVideoPlaybackTranscoding { get; set; }
public bool EnablePlaybackRemuxing { get; set; }
public bool ForceRemoteSourceTranscoding { get; set; }
public bool EnableContentDeletion { get; set; }
public string[] EnableContentDeletionFromFolders { get; set; }
@@ -93,7 +94,7 @@ namespace MediaBrowser.Model.Users
EnableAudioPlaybackTranscoding = true;
EnableVideoPlaybackTranscoding = true;
EnablePlaybackRemuxing = true;
ForceRemoteSourceTranscoding = false;
EnableLiveTvManagement = true;
EnableLiveTvAccess = true;