lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update image

Browse Source
This commit is contained in:
Luke Pulverenti 2015-02-09 13:29:06 -05:00
parent f03f2346f3
commit 4d6c37f116
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -1085,13 +1085,6 @@ namespace MediaBrowser.Controller.Entities
{ {
return false; return false;
} }
if (policy.AllowedTags.Length > 0 && IsAllowTagFilterEnforced())
{
if (policy.AllowedTags.Any(i => !hasTags.Tags.Contains(i, StringComparer.OrdinalIgnoreCase)))
{
return false;
}
}
} }
return true; return true;

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

@ -29,7 +29,6 @@ namespace MediaBrowser.Model.Users
public int? MaxParentalRating { get; set; } public int? MaxParentalRating { get; set; }
public string[] BlockedTags { get; set; } public string[] BlockedTags { get; set; }
public string[] AllowedTags { get; set; }
public bool EnableUserPreferenceAccess { get; set; } public bool EnableUserPreferenceAccess { get; set; }
public AccessSchedule[] AccessSchedules { get; set; } public AccessSchedule[] AccessSchedules { get; set; }
public UnratedItem[] BlockUnratedItems { get; set; } public UnratedItem[] BlockUnratedItems { get; set; }
@ -68,7 +67,6 @@ namespace MediaBrowser.Model.Users
EnableSharedDeviceControl = true; EnableSharedDeviceControl = true;
BlockedTags = new string[] { }; BlockedTags = new string[] { };
AllowedTags = new string[] { };
BlockUnratedItems = new UnratedItem[] { }; BlockUnratedItems = new UnratedItem[] { };
EnableUserPreferenceAccess = true; EnableUserPreferenceAccess = true;

5
MediaBrowser.Server.Implementations/Localization/Server/server.json
View File

@ -63,7 +63,7 @@
"LabelSyncTempPath": "Temporary file path:", "LabelSyncTempPath": "Temporary file path:",
"LabelSyncTempPathHelp": "Specify a custom sync working folder. Converted media created during the sync process will be stored here.", "LabelSyncTempPathHelp": "Specify a custom sync working folder. Converted media created during the sync process will be stored here.",
"LabelCustomCertificatePath": "Custom certificate path:", "LabelCustomCertificatePath": "Custom certificate path:",
"LabelCustomCertificatePathHelp": "Supply your own ssl certificate. If omitted, the server will create a self-signed certificate.", "LabelCustomCertificatePathHelp": "Supply your own ssl certificate .pfx file. If omitted, the server will create a self-signed certificate.",
"TitleNotifications": "Notifications", "TitleNotifications": "Notifications",
"ButtonDonateWithPayPal": "Donate with PayPal", "ButtonDonateWithPayPal": "Donate with PayPal",
"OptionDetectArchiveFilesAsMedia": "Detect archive files as media", "OptionDetectArchiveFilesAsMedia": "Detect archive files as media",
@ -494,8 +494,6 @@
"OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging", "OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging",
"OptionEnableDebugTranscodingLoggingHelp": "This will create very large log files and is only recommended as needed for troubleshooting purposes.", "OptionEnableDebugTranscodingLoggingHelp": "This will create very large log files and is only recommended as needed for troubleshooting purposes.",
"OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging", "OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging",
"OptionUpscaling": "Allow clients to request upscaled video",
"OptionUpscalingHelp": "In some cases this will result in improved video quality but will increase CPU usage.",
"EditCollectionItemsHelp": "Add or remove any movies, series, albums, books or games you wish to group within this collection.", "EditCollectionItemsHelp": "Add or remove any movies, series, albums, books or games you wish to group within this collection.",
"HeaderAddTitles": "Add Titles", "HeaderAddTitles": "Add Titles",
"LabelEnableDlnaPlayTo": "Enable DLNA Play To", "LabelEnableDlnaPlayTo": "Enable DLNA Play To",
@ -1357,7 +1355,6 @@
"HeaderYears": "Years", "HeaderYears": "Years",
"HeaderAddTag": "Add Tag", "HeaderAddTag": "Add Tag",
"LabelBlockContentWithTags": "Block content with tags:", "LabelBlockContentWithTags": "Block content with tags:",
"LabelAllowContentWithTags": "Allow only content with tags:",
"LabelTag": "Tag:", "LabelTag": "Tag:",
"LabelEnableSingleImageInDidlLimit": "Limit to single embedded image", "LabelEnableSingleImageInDidlLimit": "Limit to single embedded image",
"LabelEnableSingleImageInDidlLimitHelp": "Some devices will not render properly if multiple images are embedded within Didl.", "LabelEnableSingleImageInDidlLimitHelp": "Some devices will not render properly if multiple images are embedded within Didl.",