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

Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore

Browse Source 
# Conflicts:
#	.gitignore
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
This commit is contained in:
Bjarke Berg
2020-12-07 11:56:38 +01:00
parent 1a35cf5164 7ff0f9ee20
commit 5dbddfffc5
46 changed files with 851 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Models/Mapping/ContentPropertyMapDefinition.cs
View File

@@ -39,7 +39,7 @@ namespace Umbraco.Web.Models.Mapping
target.Id = source.Id;
target.IsActive = true;
target.Label = source.Name;
}
}
private void Map(IProperty source, ContentPropertyBasic target, MapperContext context)
{