Merge remote-tracking branch 'origin/v12/dev' into v13/dev

# Conflicts:
#	src/Umbraco.Core/CompatibilitySuppressions.xml
#	src/Umbraco.Core/Routing/UmbracoRequestPaths.cs
#	src/Umbraco.Infrastructure/CompatibilitySuppressions.xml
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs
This commit is contained in:
Bjarke Berg
2023-03-20 08:49:27 +01:00
86 changed files with 4479 additions and 978 deletions

View File

@@ -8,6 +8,7 @@ namespace Umbraco.Cms.Core.Models;
/// <summary>
/// A model representing the value saved for the grid
/// </summary>
[Obsolete("The grid is obsolete, will be removed in V13")]
public class GridValue
{
[JsonProperty("name")]
@@ -43,6 +44,7 @@ public class GridValue
public JToken? Config { get; set; }
}
[Obsolete("The grid is obsolete, will be removed in V13")]
public class GridArea
{
[JsonProperty("grid")]
@@ -58,6 +60,7 @@ public class GridValue
public JToken? Config { get; set; }
}
[Obsolete("The grid is obsolete, will be removed in V13")]
public class GridControl
{
[JsonProperty("value")]
@@ -73,6 +76,7 @@ public class GridValue
public JToken? Config { get; set; }
}
[Obsolete("The grid is obsolete, will be removed in V13")]
public class GridEditor
{
[JsonProperty("alias")]