Merge branch 'main' into hishamco/resources-sri

src/OrchardCore.Build/Dependencies.props

@@ -44,7 +44,7 @@
     <PackageManagement Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageManagement Include="NEST" Version="7.17.5" />
     <PackageManagement Include="NJsonSchema" Version="10.9.0" />
-    <PackageManagement Include="NLog.Web.AspNetCore" Version="5.2.3" />
+    <PackageManagement Include="NLog.Web.AspNetCore" Version="5.3.0" />
     <PackageManagement Include="NodaTime" Version="3.1.9" />
     <PackageManagement Include="OpenIddict.AspNetCore" Version="4.4.0" />
     <PackageManagement Include="OpenIddict.Core" Version="4.4.0" />

src/OrchardCore.Modules/OrchardCore.Resources/OrchardCore.Resources.csproj

@@ -9,18 +9,10 @@
     <PackageTags>$(PackageTags) OrchardCoreFramework</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Remove="wwwroot\Styles\ui\icons.svg" />
-  </ItemGroup>
-
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="wwwroot\Styles\ui\icons.svg" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.DisplayManagement.Liquid\OrchardCore.DisplayManagement.Liquid.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.csproj" />

src/OrchardCore.Modules/OrchardCore.Resources/ResourceManagementOptionsConfiguration.cs

@@ -43,7 +43,7 @@ ResourceManifest BuildManifest()
                 .DefineScript("jQuery.slim")
                 .SetUrl("~/OrchardCore.Resources/Scripts/jquery.slim.min.js", "~/OrchardCore.Resources/Scripts/jquery.slim.js")
                 .SetCdn("https://code.jquery.com/jquery-3.7.0.slim.min.js", "https://code.jquery.com/jquery-3.7.0.slim.js")
-                .SetCdnIntegrity("9UvaO0iXgg7,sha384-w5y/xIeYixWvfM+A1cEbmHPURnvyqmVg5eVENruEdDjcyRLUSNej7512JQGspFUr", "sha384-VL8kOjBfskeSJSSQ+WVg0FhbQBudbviBQz4N9owZTFBqbb30htL9q46oLaCYU4no")
+                .SetCdnIntegrity("sha384-w5y/xIeYixWvfM+A1cEbmHPURnvyqmVg5eVENruEdDjcyRLUSNej7512JQGspFUr", "sha384-VL8kOjBfskeSJSSQ+WVg0FhbQBudbviBQz4N9owZTFBqbb30htL9q46oLaCYU4no")
                 .SetVersion("3.7.0");
 
             manifest

src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/List.cshtml

@@ -68,7 +68,9 @@
                         <label class="form-check-label" for="[email protected]">&nbsp;</label>
                     </div>
                     <div class="w-100">
+                        <a class="@(entry.Enabled ? String.Empty: "text-muted")" asp-action="Display" asp-route-sitemapId="@entry.SitemapId">@entry.Name</a>
                         <div class="float-end">
+                            <a class="btn btn-info btn-sm" asp-action="Display" asp-route-sitemapId="@entry.SitemapId">@T["Manage Sources"]</a>
                             @if (entry.Enabled)
                             {
                                 <a asp-action="Index" asp-controller="Sitemap" asp-area="OrchardCore.Sitemaps" asp-route-sitemapId="@entry.SitemapId" target="_blank" class="btn btn-success btn-sm">@T["View"]</a>
@@ -86,7 +88,6 @@
                                 </ul>
                             </div>
                         </div>
-                        <a class="@(entry.Enabled ? "": "text-muted")" asp-action="Display" asp-route-sitemapId="@entry.SitemapId">@entry.Name</a>
                     </div>
                 </li>
             }

src/docs/reference/modules/Elasticsearch/README.md

@@ -335,3 +335,7 @@ Here is a small table to compare Lucene and Elasticsearch (string) types:
 | StringField | Keyword  | A field that is indexed but not tokenized: the entire value is indexed as a single token     | original value AND indexed | [stored fields](https://www.elastic.co/guide/en/elasticsearch/reference/current/term-level-queries.html) because indexed as a single token.  |
 | TextField   | Text     | A field that is indexed and tokenized, without term vectors | original value AND indexed  | [analyzed fields](https://www.elastic.co/guide/en/elasticsearch/reference/current/full-text-queries.html). Also known as full-text search |
 | StoredField | stored in _source by mapping configuration | A field containing original value (not analyzed) | original value | [stored fields](https://www.elastic.co/guide/en/elasticsearch/reference/current/term-level-queries.html) |
+
+## Video
+
+<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/7Mx1Vjsy3Xw" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>

src/docs/reference/modules/Notifications/README.md

@@ -32,3 +32,11 @@ You can send notification to a user via code by injecting `INotificationService`
 When `OrchardCore.Workflows` feature is enabled, you'll see new activities that would allow you to notify users using workflows. Here are some of the available workflow tasks
  - Notify Content's Owner Task
  - Notify User Task
+
+## Videos
+
+<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/HMXPzkWE0ww" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/Lj2g-bBy-I0" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/_3pTgV4oTxU" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>

src/docs/resources/libraries/README.md

@@ -31,7 +31,7 @@ The below table lists the different .NET libraries used in Orchard Core:
 | [Moq](https://github.com/moq/moq) | The most popular and friendly mocking framework for .NET. | 4.18.4 | [MIT](https://github.com/moq/moq/blob/main/LICENSE) |
 | [NCrontab](https://github.com/atifaziz/NCrontab) | Crontab for .NET | 3.3.1 | [Apache-2.0](https://github.com/atifaziz/NCrontab/blob/master/COPYING.txt) |
 | [NEST](https://github.com/elastic/elasticsearch-net) | .NET Library for Elasticsearch | 7.17.5 | [Apache-2.0](https://github.com/elastic/elasticsearch-net/blob/main/LICENSE.txt) |
-| [NLog.Web.AspNetCore](https://github.com/NLog/NLog.Web/tree/master/src/NLog.Web.AspNetCore) | NLog integration for ASP.NET. | 5.2.3 | [BSD-3-Clause](https://github.com/NLog/NLog.Web/blob/master/LICENSE) |
+| [NLog.Web.AspNetCore](https://github.com/NLog/NLog.Web/tree/master/src/NLog.Web.AspNetCore) | NLog integration for ASP.NET. | 5.3.0 | [BSD-3-Clause](https://github.com/NLog/NLog.Web/blob/master/LICENSE) |
 | [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) | Json.NET is a popular high-performance JSON framework for .NET | 13.0.3 | [MIT](https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md) |
 | [NJsonSchema](https://github.com/RicoSuter/NJsonSchema) | JSON Schema reader, generator and validator for .NET | 10.9.0 | [MIT](https://github.com/RicoSuter/NJsonSchema/blob/master/LICENSE.md) |
 | [Noda Time](https://github.com/nodatime/nodatime) | A better date and time API for .NET. | 3.1.9 | [Apache-2.0](https://github.com/nodatime/nodatime/blob/master/LICENSE.txt) |