Merge pull request #5 from OrchardCMS/dev

Merge for final round of Elastic Search

.all-contributorsrc

@@ -2152,6 +2152,7 @@
       "avatar_url": "https://avatars3.githubusercontent.com/u/12182810?v=4",
       "profile": "https://github.com/Diman96",
       "contributions": [
+        "doc",
         "code"
       ]
     },
@@ -2316,6 +2317,33 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "andycyberian",
+      "name": "Andy Rose",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4202906?v=4",
+      "profile": "http://cyberian.co.uk",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "doticca",
+      "name": "Fotis G. Pappas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6129662?v=4",
+      "profile": "http://www.doticca.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "vlodkopits",
+      "name": "vlodkopits",
+      "avatar_url": "https://avatars.githubusercontent.com/u/14543503?v=4",
+      "profile": "https://github.com/vlodkopits",
+      "contributions": [
+        "translation"
+      ]
     }
   ],
   "skipCi": true

.github/workflows/functional_all_db.yml

@@ -10,7 +10,7 @@ jobs:
     name: Functional Tests - MVC
     runs-on: ubuntu-latest
     container:
-      image: cypress/included:7.1.0
+      image: cypress/included:7.5.0
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
@@ -43,7 +43,7 @@ jobs:
     name: Functional Tests - CMS Sqlite
     runs-on: ubuntu-latest
     container:
-      image: cypress/included:7.1.0
+      image: cypress/included:7.5.0
     steps:
     - uses: actions/checkout@v2
     - name: Setup .NET Core 3.1
@@ -75,7 +75,7 @@ jobs:
     name: Functional Tests - CMS Postgres
     runs-on: ubuntu-latest
     container:
-      image: cypress/included:7.1.0
+      image: cypress/included:7.5.0
     services:
       postgres:
         image: postgres:11
@@ -123,7 +123,7 @@ jobs:
     name: Functional Tests - CMS MySql
     runs-on: ubuntu-latest
     container:
-      image: cypress/included:7.1.0
+      image: cypress/included:7.5.0
     services:
       mariadb:
         image: mariadb:latest
@@ -167,7 +167,7 @@ jobs:
     name: Functional Tests - CMS SqlServer 2019
     runs-on: ubuntu-latest
     container:
-      image: cypress/included:7.1.0
+      image: cypress/included:7.5.0
     services:
       mssql:
         image: mcr.microsoft.com/mssql/server:2019-latest

.vscode/launch.json

@@ -67,7 +67,7 @@
       "name": ".NET Core Attach",
       "type": "coreclr",
       "request": "attach",
-      "processId": 0
+      "processId": "${command:pickProcess}"
     },
     {
       "name": ".NET Core Launch (publish framework dependent) - net5.0",

OrchardCore.sln

@@ -239,6 +239,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DerivedThemeSample2", "test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.OpenId.Core", "src\OrchardCore\OrchardCore.OpenId.Core\OrchardCore.OpenId.Core.csproj", "{A6E50FF8-BA44-4E59-95CD-3758300B9765}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Spatial", "src\OrchardCore.Modules\OrchardCore.Spatial\OrchardCore.Spatial.csproj", "{82FA0DC3-8049-4C34-B1BA-0D5370CB3C16}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Workflows", "src\OrchardCore.Modules\OrchardCore.Workflows\OrchardCore.Workflows.csproj", "{9973E641-B464-47F2-AA86-6A234B2A9604}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Workflows.Abstractions", "src\OrchardCore\OrchardCore.Workflows.Abstractions\OrchardCore.Workflows.Abstractions.csproj", "{DE05E6A4-EDF4-4A88-80BF-328CA3AEAEAC}"
@@ -398,6 +400,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrchardCore.Roles.Core", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.AutoSetup", "src\OrchardCore.Modules\OrchardCore.AutoSetup\OrchardCore.AutoSetup.csproj", "{1E76C17C-099A-4E6D-BC26-E93CBA4D0BD6}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Data.YesSql", "src\OrchardCore\OrchardCore.Data.YesSql\OrchardCore.Data.YesSql.csproj", "{F06E4E20-3675-4BA5-AD2D-4538FAB154D5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Data.YesSql.Abstractions", "src\OrchardCore\OrchardCore.Data.YesSql.Abstractions\OrchardCore.Data.YesSql.Abstractions.csproj", "{AB47A65C-7BA9-4CE7-BA73-285EB7A2CEFD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -812,6 +818,10 @@ Global
 		{A6E50FF8-BA44-4E59-95CD-3758300B9765}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A6E50FF8-BA44-4E59-95CD-3758300B9765}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6E50FF8-BA44-4E59-95CD-3758300B9765}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82FA0DC3-8049-4C34-B1BA-0D5370CB3C16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82FA0DC3-8049-4C34-B1BA-0D5370CB3C16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82FA0DC3-8049-4C34-B1BA-0D5370CB3C16}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82FA0DC3-8049-4C34-B1BA-0D5370CB3C16}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9973E641-B464-47F2-AA86-6A234B2A9604}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9973E641-B464-47F2-AA86-6A234B2A9604}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9973E641-B464-47F2-AA86-6A234B2A9604}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1084,6 +1094,14 @@ Global
 		{1E76C17C-099A-4E6D-BC26-E93CBA4D0BD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E76C17C-099A-4E6D-BC26-E93CBA4D0BD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E76C17C-099A-4E6D-BC26-E93CBA4D0BD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F06E4E20-3675-4BA5-AD2D-4538FAB154D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F06E4E20-3675-4BA5-AD2D-4538FAB154D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F06E4E20-3675-4BA5-AD2D-4538FAB154D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F06E4E20-3675-4BA5-AD2D-4538FAB154D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB47A65C-7BA9-4CE7-BA73-285EB7A2CEFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB47A65C-7BA9-4CE7-BA73-285EB7A2CEFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB47A65C-7BA9-4CE7-BA73-285EB7A2CEFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB47A65C-7BA9-4CE7-BA73-285EB7A2CEFD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1201,6 +1219,7 @@ Global
 		{DFF19F43-F724-4A80-9267-7B2C40D1DC6D} = {72E15FB1-45AB-46CB-B332-40FDFDD2B272}
 		{713E40F9-E711-43B5-B9B3-985325C7BF91} = {72E15FB1-45AB-46CB-B332-40FDFDD2B272}
 		{A6E50FF8-BA44-4E59-95CD-3758300B9765} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
+		{82FA0DC3-8049-4C34-B1BA-0D5370CB3C16} = {90030E85-0C4F-456F-B879-443E8A3F220D}
 		{9973E641-B464-47F2-AA86-6A234B2A9604} = {A066395F-6F73-45DC-B5A6-B4E306110DCE}
 		{DE05E6A4-EDF4-4A88-80BF-328CA3AEAEAC} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 		{541A4936-4D31-4A7E-B8DA-D01D76E4E652} = {A066395F-6F73-45DC-B5A6-B4E306110DCE}
@@ -1273,6 +1292,8 @@ Global
 		{1D0144D0-9E6D-441B-A393-B62F6DC8E97E} = {90030E85-0C4F-456F-B879-443E8A3F220D}
 		{15E0499A-815D-4E98-B1E4-1C9D7B3D1461} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 		{1E76C17C-099A-4E6D-BC26-E93CBA4D0BD6} = {A066395F-6F73-45DC-B5A6-B4E306110DCE}
+		{F06E4E20-3675-4BA5-AD2D-4538FAB154D5} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
+		{AB47A65C-7BA9-4CE7-BA73-285EB7A2CEFD} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {46A1D25A-78D1-4476-9CBF-25B75E296341}

mkdocs.yml

@@ -3,13 +3,25 @@ theme:
   name: material  
   custom_dir: src/docs/theme
   logo: docs/assets/images/orchard-logo.png
-  favicon: docs/assets/images/favicon-blue.png
+  favicon: docs/assets/images/favicon.png
   features:
     - navigation.instant
     - navigation.tabs
-  palette:
-    primary: blue
-    accent: light blue
+  palette:    
+    - media: "(prefers-color-scheme: light)"
+      scheme: default
+      primary: teal
+      accent: green
+      toggle:
+        icon: material/toggle-switch-off-outline
+        name: Switch to dark mode
+    - media: "(prefers-color-scheme: dark)"
+      scheme: slate
+      primary: teal
+      accent: green
+      toggle:
+        icon: material/toggle-switch
+        name: Switch to light mode
   static_templates:
     - 404.html
 
@@ -90,6 +102,7 @@ nav:
         - Customize encoding settings: docs/guides/encoding-settings/README.md
         - Understanding Content Definitions Stores: docs/guides/content-definitions/README.md 
         - Change password configuration: docs/guides/password-configuration/README.md 
+        - Change lockout configuration: docs/guides/lockout-configuration/README.md 
         - Azure AD integration: docs/guides/azuread-integration/README.md 
         - Create a Liquid Widget: docs/guides/create-liquid-widget/README.md 
     - Key Topics: 
@@ -144,6 +157,7 @@ nav:
             - Rules: docs/reference/modules/Rules/README.md
             - Shortcodes: docs/reference/modules/Shortcodes/README.md
             - Sitemaps: docs/reference/modules/Sitemaps/README.md
+            - Spatial: docs/reference/modules/Spatial/README.md
             - XML-RPC: docs/reference/modules/XmlRpc/README.md
             - Menu: docs/reference/modules/Menu/README.md
             - Navigation: docs/reference/modules/Navigation/README.md