Merge branch 'main' into hishamco/ulid

OrchardCMS · Oct 24, 2024 · 65e5829 · 65e5829
2 parents 82f92da + bd93e29
commit 65e5829
Show file tree

Hide file tree

Showing 145 changed files with 5,167 additions and 1,241 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -3213,6 +3213,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "denispetrische",
+      "name": "Denis",
+      "avatar_url": "https://avatars.githubusercontent.com/u/95141776?v=4",
+      "profile": "https://github.com/denispetrische",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "skipCi": true,

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,22 +7,29 @@ assignees: ''
 
 ---
 <!-- Please also see the docs on how we manage issues: https://docs.orchardcore.net/en/latest/docs/guides/contributing/managing-issues/. -->
+<!-- Please replace all placeholders such as this below. -->
 
 ### Describe the bug
 
+<!-- What is the issue you're seeing? -->
+
 ### Orchard Core version
 
-Add the version of the Orchard Core NuGet packages you use, or the commit hash if you can reproduce this with the source code.
+<!-- Add the version of the Orchard Core NuGet packages you use, or the commit hash if you can reproduce this with the source code. -->
 
 ### To Reproduce
-Steps to reproduce the behavior:
+
+<!-- Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '...'
 3. Scroll down to '...'
-4. See error
+4. See error 
+-->
 
 ### Expected behavior
-A clear and concise description of what you expected to happen.
+
+<!-- Add a clear and concise description of what you expected to happen. -->
 
 ### Logs and screenshots
-If applicable, add log files, browser console logs, and screenshots (or screen recording videos) to help explain your problem.
+
+<!-- If applicable, add log files, browser console logs, and screenshots (or screen recording videos) to help explain your problem. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,12 +7,16 @@ assignees: ''
 
 ---
 <!-- Please also see the docs on how we manage issues: https://docs.orchardcore.net/en/latest/docs/guides/contributing/managing-issues/. -->
+<!-- Please replace all placeholders such as this below. -->
 
-### Is your feature request related to a problem? Please describe.
-A clear and concise description of what the problem is.
+### Is your feature request related to a problem?
+
+<!-- Add a clear and concise description of the problem. -->
 
 ### Describe the solution you'd like
-A clear and concise description of what you want to happen.
+
+<!-- Add a clear and concise description of what you want to happen. -->
 
 ### Describe alternatives you've considered
-A clear and concise description of any alternative solutions or features you've considered.
+
+<!-- Add a clear and concise description of any alternative solutions or features you've considered. -->
diff --git a/.github/ISSUE_TEMPLATE/thanks.md b/.github/ISSUE_TEMPLATE/thanks.md
@@ -0,0 +1,19 @@
+---
+name: Thank you
+about: Let us know you appreciate Orchard Core
+labels: thanks
+---
+
+<!-- Please replace all placeholders such as this below. -->
+
+### How do you use Orchard Core?
+
+<!-- We’d love to know how you use Orchard Core, so we can better understand what to focus on. -->
+
+### What do you like about Orchard Core?
+
+<!-- Thank you for your for the kind words! -->
+
+### How did you learn about Orchard Core?
+
+<!-- It's always nice to know where and how people discover Orchard Core. -->
diff --git a/OrchardCore.sln b/OrchardCore.sln
@@ -527,6 +527,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Queries.Core",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Sms.Azure", "src\OrchardCore.Modules\OrchardCore.Sms.Azure\OrchardCore.Sms.Azure.csproj", "{013C8BBF-6879-4B47-80C9-A466923E45E5}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.UrlRewriting", "src\OrchardCore.Modules\OrchardCore.UrlRewriting\OrchardCore.UrlRewriting.csproj", "{D0F8B342-BDA8-44CB-AA43-7A65C79636A2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrchardCore.UrlRewriting.Abstractions", "src\OrchardCore\OrchardCore.UrlRewriting.Abstractions\OrchardCore.UrlRewriting.Abstractions.csproj", "{675C8A76-C64F-47EC-B4F5-06D4F2D9662A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrchardCore.UrlRewriting.Core", "src\OrchardCore\OrchardCore.UrlRewriting.Core\OrchardCore.UrlRewriting.Core.csproj", "{7B18DD99-A7BB-4297-8679-D87289758756}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1395,6 +1401,18 @@ Global
 		{013C8BBF-6879-4B47-80C9-A466923E45E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{013C8BBF-6879-4B47-80C9-A466923E45E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{013C8BBF-6879-4B47-80C9-A466923E45E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0F8B342-BDA8-44CB-AA43-7A65C79636A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0F8B342-BDA8-44CB-AA43-7A65C79636A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0F8B342-BDA8-44CB-AA43-7A65C79636A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0F8B342-BDA8-44CB-AA43-7A65C79636A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{675C8A76-C64F-47EC-B4F5-06D4F2D9662A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{675C8A76-C64F-47EC-B4F5-06D4F2D9662A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{675C8A76-C64F-47EC-B4F5-06D4F2D9662A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{675C8A76-C64F-47EC-B4F5-06D4F2D9662A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B18DD99-A7BB-4297-8679-D87289758756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B18DD99-A7BB-4297-8679-D87289758756}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B18DD99-A7BB-4297-8679-D87289758756}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B18DD99-A7BB-4297-8679-D87289758756}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1636,6 +1654,9 @@ Global
 		{4BAA08A2-878C-4B96-86BF-5B3DB2B6C2C7} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 		{61B358F2-702C-40AA-9DF7-7121248FE6DE} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 		{013C8BBF-6879-4B47-80C9-A466923E45E5} = {A066395F-6F73-45DC-B5A6-B4E306110DCE}
+		{D0F8B342-BDA8-44CB-AA43-7A65C79636A2} = {A066395F-6F73-45DC-B5A6-B4E306110DCE}
+		{675C8A76-C64F-47EC-B4F5-06D4F2D9662A} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
+		{7B18DD99-A7BB-4297-8679-D87289758756} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {46A1D25A-78D1-4476-9CBF-25B75E296341}

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -262,6 +262,7 @@ nav:
           - Workflows: reference/modules/Workflows/README.md
           - DataProtection (Azure Storage): reference/modules/DataProtection.Azure/README.md
           - Background Tasks: reference/modules/BackgroundTasks/README.md
+          - URL Rewriting: reference/modules/UrlRewriting/README.md
           - Reverse Proxy: reference/modules/ReverseProxy/README.md
   - Resources:
       - Learning: resources/README.md

diff --git a/src/OrchardCore.Cms.Web/appsettings.json b/src/OrchardCore.Cms.Web/appsettings.json
@@ -55,7 +55,7 @@
     //  "AssetsRequestPath": "/media",
     //  "AssetsPath": "Media",
     //  "UseTokenizedQueryString": true,
-    //  "AllowedFileExtensions": [".jpg",".jpeg",".png",".gif",".ico",".svg",".webp",".pdf",".doc",".docx",".ppt",".pptx",".pps",".ppsx",".odt",".xls",".xlsx",".psd",".mp3",".m4a",".ogg",".wav",".mp4",".m4v",".mov",".wmv",".avi",".mpg",".ogv",".3gp"],
+    //  "AllowedFileExtensions": [".jpg",".jpeg",".png",".gif",".ico",".svg",".webp",".pdf",".doc",".docx",".ppt",".pptx",".pps",".ppsx",".odt",".xls",".xlsx",".psd",".mp3",".m4a",".ogg",".wav",".mp4",".m4v",".mov",".wmv",".avi",".mpg",".ogv",".3gp",".webm"],
     //  "ContentSecurityPolicy": "default-src 'self'; style-src 'unsafe-inline'",
     //  "MaxUploadChunkSize": 104857600,
     //  "TemporaryFileLifetime": "01:00:00"

diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/package-lock.json b/src/OrchardCore.Modules/OrchardCore.AuditTrail/package-lock.json
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentTypeSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentTypeSettingsDisplayDriver.cs
@@ -86,6 +86,11 @@ private static void Apply(UpdateTypeEditorContext context, ContentTypeSettingsVi
         {
             context.Builder.Listable(model.Listable);
         }
+
+        if (options.ShowDraftable)
+        {
+            context.Builder.Draftable(model.Draftable);
+        }
     }
 
     private async Task<ContentTypeDefinitionDriverOptions> GetOptionsAsync(ContentTypeDefinition contentTypeDefinition, string stereotype)

diff --git a/src/OrchardCore.Modules/OrchardCore.DataProtection.Azure/BlobModularTenantEvents.cs b/src/OrchardCore.Modules/OrchardCore.DataProtection.Azure/BlobModularTenantEvents.cs
@@ -8,10 +8,10 @@ namespace OrchardCore.DataProtection.Azure;
 /// <summary>
 /// A tenant event that deletes data protection blobs from a container when a tenant is deleted.
 /// </summary>
-public class BlobModularTenantEvents : ModularTenantEvents
+internal sealed class BlobModularTenantEvents : ModularTenantEvents
 {
     private readonly BlobOptions _blobOptions;
-    private readonly ILogger<BlobModularTenantEvents> _logger;
+    private readonly ILogger _logger;
 
     public BlobModularTenantEvents(
         BlobOptions blobOptions,
@@ -25,7 +25,7 @@ public BlobModularTenantEvents(
     /// Removes the data protection blob from the container when a tenant is deleted.
     /// </summary>
     /// <param name="context">The <see cref="ShellRemovingContext"/></param>
-    public async override Task RemovingAsync(ShellRemovingContext context)
+    public override Task RemovingAsync(ShellRemovingContext context)
     {
         var blobClient = new BlobClient(
             _blobOptions.ConnectionString,
@@ -34,6 +34,6 @@ public async override Task RemovingAsync(ShellRemovingContext context)
 
         _logger.LogDebug("Deleting blob '{BlobName}' from container '{ContainerName}'.", _blobOptions.BlobName, _blobOptions.ContainerName);
 
-        await blobClient.DeleteIfExistsAsync();
+        return blobClient.DeleteIfExistsAsync();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Edit.cshtml
@@ -116,6 +116,9 @@
                 cursor: "move",
                 opacity: 0.7,
                 tolerance: "pointer",
+                scrollSensitivity: 150,
+                scrollSpeed: 100,
+                animation: 150,
                 placeholder: {
                     element: function (currentItem) {
                         return $('<div class="widget-dragdrop-placeholder"><div></div></div>')[0];

diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaOptionsConfiguration.cs
@@ -47,6 +47,7 @@ public sealed class MediaOptionsConfiguration : IConfigureOptions<MediaOptions>
         ".mpg",
         ".ogv", // (Ogg)
         ".3gp", // (3GPP)
+        ".webm",
     ];
 
     private const int DefaultMaxBrowserCacheDays = 30;

diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Users/Handlers/LoginFormEventEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Users/Handlers/LoginFormEventEventHandler.cs
@@ -13,31 +13,37 @@ public LoginFormEventEventHandler(ReCaptchaService reCaptchaService)
         _reCaptchaService = reCaptchaService;
     }
 
-    public Task IsLockedOutAsync(IUser user) => Task.CompletedTask;
+    public Task IsLockedOutAsync(IUser user)
+        => Task.CompletedTask;
 
     public Task LoggedInAsync(IUser user)
     {
         _reCaptchaService.ThisIsAHuman();
+
         return Task.CompletedTask;
     }
 
-    public async Task LoggingInAsync(string userName, Action<string, string> reportError)
+    public Task LoggingInAsync(string userName, Action<string, string> reportError)
     {
         if (_reCaptchaService.IsThisARobot())
         {
-            await _reCaptchaService.ValidateCaptchaAsync(reportError);
+            return _reCaptchaService.ValidateCaptchaAsync(reportError);
         }
+
+        return Task.CompletedTask;
     }
 
     public Task LoggingInFailedAsync(string userName)
     {
         _reCaptchaService.MaybeThisIsARobot();
+
         return Task.CompletedTask;
     }
 
     public Task LoggingInFailedAsync(IUser user)
     {
         _reCaptchaService.MaybeThisIsARobot();
+
         return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/ResourceManagementOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Resources/ResourceManagementOptionsConfiguration.cs
@@ -479,9 +479,9 @@ private ResourceManifest BuildManifest()
         manifest
             .DefineScript("Sortable")
             .SetUrl("~/OrchardCore.Resources/Scripts/Sortable.min.js", "~/OrchardCore.Resources/Scripts/Sortable.js")
-            .SetCdn("https://cdn.jsdelivr.net/npm/[email protected].0/Sortable.min.js", "https://cdn.jsdelivr.net/npm/[email protected].0/Sortable.js")
-            .SetCdnIntegrity("sha384-eeLEhtwdMwD3X9y+8P3Cn7Idl/M+w8H4uZqkgD/2eJVkWIN1yKzEj6XegJ9dL3q0", "sha384-OFIl93h6jYoAF+hATXncsLYMiLo81FpuReH3fgCI4wep7qNCmiA2I0bwcvVqHSBj")
-            .SetVersion("1.15.0");
+            .SetCdn("https://cdn.jsdelivr.net/npm/[email protected].3/Sortable.min.js", "https://cdn.jsdelivr.net/npm/[email protected].3/Sortable.js")
+            .SetCdnIntegrity("sha384-/jkFGhPVLS9HIUzX09xB5W3coE5q1X5NXZA/PuOAdOaRxUPczlZmKzYEq9QcJnW0", "sha384-do1oujgtpAbjFRK6zLARg2zWqak7wvdRd7R7BHxErnVtSx8QUGQTv+QMTxsI+Bxq")
+            .SetVersion("1.15.3");
 
         manifest
             .DefineScript("vuedraggable")

diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/package-lock.json b/src/OrchardCore.Modules/OrchardCore.Resources/package-lock.json
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/package.json b/src/OrchardCore.Modules/OrchardCore.Resources/package.json
@@ -13,7 +13,7 @@
     "jquery.easing": "1.4.1",
     "js-cookie": "3.0.5",
     "monaco-editor": "^0.46.0",
-    "sortablejs": "^1.14.0",
+    "sortablejs": "^1.15.3",
     "trumbowyg": "2.28.0",
     "vue": "^2.6.14",
     "vue-multiselect": "^2.1.6",