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

Merge branch 'dev-v7' into temp8 == Shan or Stephan please review this !

Browse Source 
* Contains a change to work with V8 - content.notify.controller sends a string array
* C# ContentController methods reworked to newer services available & API POST is model bound to string array

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/dialogs/notifications.aspx
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs
This commit is contained in:
Warren
2018-08-07 15:48:21 +01:00
parent 5e01da2013 abb88f20f9
commit 6372d393ee
18 changed files with 206 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/Trees/ContentTreeController.cs
View File

@@ -235,8 +235,8 @@ namespace Umbraco.Web.Trees
AddActionNode<ActionAssignDomain>(item, menu);
AddActionNode<ActionRights>(item, menu, convert: true);
AddActionNode<ActionProtect>(item, menu, true, true);
AddActionNode<ActionNotify>(item, menu, true, true);
AddActionNode<ActionNotify>(item, menu, true);
AddActionNode<ActionSendToTranslate>(item, menu, convert: true);
AddActionNode<RefreshNode, ActionRefresh>(item, menu, true);