Merge remote-tracking branch 'origin/dev' into issue/LMBQ-253

Lombiq · Dec 20, 2023 · c4e44d5 · c4e44d5
2 parents 0446840 + 9b9c9c1
commit c4e44d5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/Lombiq.OSOCE.Web/Recipes/Lombiq.OSOCE.Tests.recipe.json b/src/Lombiq.OSOCE.Web/Recipes/Lombiq.OSOCE.Tests.recipe.json
@@ -42,6 +42,7 @@
         "Lombiq.Hosting.Tenants.IdleTenantManagement.ShutDownIdleTenants",
         "Lombiq.Hosting.Tenants.EmailQuotaManagement",
         "Lombiq.JsonEditor",
+        "Lombiq.JsonEditor.ContentEditor",
         "Lombiq.LoginAsAnybody",
         "Lombiq.OSOCE.Samples",
         // We only enable these on a specific test, because it overlaps with too many things.

diff --git a/src/Modules/Lombiq.JsonEditor b/src/Modules/Lombiq.JsonEditor
diff --git a/test/Lombiq.UITestingToolbox b/test/Lombiq.UITestingToolbox
+ −		Docs/actions-menu.png
+ −		Docs/content-editor.png
+13 −1		Lombiq.JsonEditor.Test.UI/Extensions/TestCaseUITestContextExtensions.cs
+3 −0		Lombiq.JsonEditor.Test.UI/Extensions/UITestContextExtensions.cs
+1 −0		Lombiq.JsonEditor/Constants/FeatureIds.cs
+163 −0		Lombiq.JsonEditor/Controllers/AdminController.cs
+30 −0		Lombiq.JsonEditor/Drivers/EditJsonActionsMenuContentDisplayDriver.cs
+2 −0		Lombiq.JsonEditor/Lombiq.JsonEditor.csproj
+11 −0		Lombiq.JsonEditor/Manifest.cs
+2 −1		Lombiq.JsonEditor/Recipes/JsonEditor.Sample.recipe.json
+32 −0		Lombiq.JsonEditor/Startup.cs
+9 −0		Lombiq.JsonEditor/ViewModels/EditContentItemViewModel.cs
+38 −0		Lombiq.JsonEditor/Views/Admin/Edit.cshtml
+13 −0		Lombiq.JsonEditor/Views/Content_EditJsonActions.cshtml
+16 −0		Readme.md
+ −		...sicVisualVerificationTests_VerifyNavbar_By_ClassName[Contains]_-navbar-brand_Unix_chrome-headless-shell.png
+ −		...BasicVisualVerificationTests_VerifyNavbar_By_ClassName[Contains]_-navbar-brand_Unix_edge-headless-shell.png
+1 −1		Lombiq.Tests.UI/Docs/SecurityScanning.md
+1 −1		Readme.md