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/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
#	src/Umbraco.Core/PublishedCache/PublishedSnapshotServiceBase.cs
#	src/Umbraco.Core/PublishedModelFactoryExtensions.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
This commit is contained in:
Bjarke Berg
2020-05-01 14:08:29 +02:00
parent e6c3c5e36e e45ffea207
commit aa31a8b5dd
132 changed files with 3763 additions and 3554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
View File

@@ -145,6 +145,16 @@ namespace Umbraco.ModelsBuilder.Embedded
return ctor();
}
/// <inheritdoc />
public bool Enabled => _config.Enable;
/// <inheritdoc />
public void Reset()
{
if (_config.Enable)
ResetModels();
}
#endregion
#region Compilation