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

Merge remote-tracking branch 'origin/temp8' into temp8-I3089

Browse Source 
# Conflicts:
#	src/Umbraco.Web/Trees/DataTypeTreeController.cs
This commit is contained in:
Shannon
2018-10-08 09:54:12 +02:00
parent 99257f2245 b6679551d4
commit b48202197f
201 changed files with 9580 additions and 4378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,7 +235,6 @@ namespace Umbraco.Web.Trees
//need to ensure some of these are converted to the legacy system - until we upgrade them all to be angularized.
AddActionNode<ActionMove>(item, menu, true);
AddActionNode<ActionCopy>(item, menu);
AddActionNode<ActionChangeDocType>(item, menu, convert: true);
AddActionNode<ActionSort>(item, menu, true);