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

Merge branch 'master' into network-rewrite

Browse Source
This commit is contained in:
Shadowghost
2023-03-03 10:42:24 +01:00
parent 7af6694594 0de37e2ac2
commit 80b8661008
102 changed files with 1210 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Model/Entities/ParentalRating.cs
View File

@@ -12,7 +12,7 @@ namespace MediaBrowser.Model.Entities
{
}
public ParentalRating(string name, int value)
public ParentalRating(string name, int? value)
{
Name = name;
Value = value;
@@ -28,6 +28,6 @@ namespace MediaBrowser.Model.Entities
/// Gets or sets the value.
/// </summary>
/// <value>The value.</value>
public int Value { get; set; }
public int? Value { get; set; }
}
}

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

@@ -46,6 +46,7 @@ namespace MediaBrowser.Model.Users
LoginAttemptsBeforeLockout = -1;
MaxActiveSessions = 0;
MaxParentalRating = null;
EnableAllChannels = true;
EnabledChannels = Array.Empty<Guid>();