Merge branch 'master' into userdb-efcore

# Conflicts:
#	Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
#	Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
#	Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
#	Emby.Server.Implementations/TV/TVSeriesManager.cs
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
This commit is contained in:
Patrick Barron
2020-06-04 16:39:50 -04:00
334 changed files with 2011 additions and 1689 deletions

View File

@@ -1,3 +1,4 @@
#nullable disable
#pragma warning disable CS1591
using System;
@@ -17,63 +18,53 @@ namespace MediaBrowser.Model.Notifications
{
Options = new[]
{
new NotificationOption
new NotificationOption(NotificationType.TaskFailed.ToString())
{
Type = NotificationType.TaskFailed.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.ServerRestartRequired.ToString())
{
Type = NotificationType.ServerRestartRequired.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.ApplicationUpdateAvailable.ToString())
{
Type = NotificationType.ApplicationUpdateAvailable.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.ApplicationUpdateInstalled.ToString())
{
Type = NotificationType.ApplicationUpdateInstalled.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.PluginUpdateInstalled.ToString())
{
Type = NotificationType.PluginUpdateInstalled.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.PluginUninstalled.ToString())
{
Type = NotificationType.PluginUninstalled.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.InstallationFailed.ToString())
{
Type = NotificationType.InstallationFailed.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.PluginInstalled.ToString())
{
Type = NotificationType.PluginInstalled.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.PluginError.ToString())
{
Type = NotificationType.PluginError.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.UserLockedOut.ToString())
{
Type = NotificationType.UserLockedOut.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
}