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

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-infrastructure-namespaces

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs
#	src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderDependencyInjectionExtensions.cs
#	src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
This commit is contained in:
Mole
2021-02-22 15:18:04 +01:00
parent 815d4fd226 9123c06aec
commit 405d0e704d
69 changed files with 312 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
View File

@@ -13,7 +13,6 @@
<CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Umbraco.ModelsBuilder.Embedded\Umbraco.ModelsBuilder.Embedded.csproj" />
<ProjectReference Include="..\Umbraco.PublishedCache.NuCache\Umbraco.PublishedCache.NuCache.csproj" />
<ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
<ProjectReference Include="..\Umbraco.Web.Common\Umbraco.Web.Common.csproj" />

2
src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml
View File

@@ -1,4 +1,4 @@
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockListModel>
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockListModel>
@{
if (!Model.Any()) { return; }
}

2
src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml
View File

@@ -1,7 +1,7 @@
@using System.Web
@using Microsoft.AspNetCore.Html
@using Newtonsoft.Json.Linq
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
@*
Razor helpers located at the bottom of this file

2
src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml
View File

@@ -1,7 +1,7 @@
@using System.Web
@using Microsoft.AspNetCore.Html
@using Newtonsoft.Json.Linq
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
@if (Model != null && Model.sections != null)
{

3
src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml
View File

@@ -1,5 +1,4 @@
@using Umbraco.Cms.Core
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
@{
string embedValue = Convert.ToString(Model.value);

2
src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml
View File

@@ -1,4 +1,4 @@
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
@if (Model.value != null)
{

4
src/Umbraco.Web.UI.NetCore/config/BackOfficeTours/getting-started.json
View File

@@ -191,7 +191,9 @@
"element": "[ng-controller*='Umbraco.Editors.DataTypePickerController'] [data-element='editor-data-type-picker']",
"elementPreventClick": true,
"title": "Editor picker",
"content": "<p>In the editor picker dialog we can pick one of the many built-in editors.</p>"
"content": "<p>In the editor picker dialog we can pick one of the many built-in editors.</p>",
},
{
"element": "[data-element~='editor-data-type-picker'] [data-element='datatype-Textarea']",