yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v10/dev' into v10/feature/nullable-reference-types-in-Umbraco-Core

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Configuration/Models/SecuritySettings.cs
#	src/Umbraco.Core/Events/DeleteEventArgs.cs
#	src/Umbraco.Core/Events/IEventDispatcher.cs
#	src/Umbraco.Core/Events/PassThroughEventDispatcher.cs
#	src/Umbraco.Core/Events/QueuingEventDispatcherBase.cs
#	src/Umbraco.Core/IO/MediaFileManager.cs
#	src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs
#	src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
This commit is contained in:
Nikolaj Geisle
2022-02-15 09:29:58 +01:00
parent e5dab9d044 548870d59d
commit 224341a533
499 changed files with 8359 additions and 3807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
View File

@@ -282,7 +282,12 @@ namespace Umbraco.Cms.Web.BackOffice.Trees
if (_emailSender.CanSendRequiredEmail())
{
AddActionNode<ActionNotify>(item, menu, true, opensDialog: true);
menu.Items.Add(new MenuItem("notify", LocalizedTextService)
{
Icon = "megaphone",
SeparatorBefore = true,
OpensDialog = true
});
}
if((item is DocumentEntitySlim documentEntity && documentEntity.IsContainer) == false)