Sync with upstrem repo

.all-contributorsrc

@@ -377,7 +377,8 @@
       "avatar_url": "https://avatars1.githubusercontent.com/u/171892?v=4",
       "profile": "http://www.quartz-scheduler.net/",
       "contributions": [
-        "code"
+        "code",
+        "translation"
       ]
     },
     {
@@ -1953,6 +1954,177 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "benschi11",
+      "name": "Benedikt Neuhold",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/698992?v=4",
+      "profile": "http://www.neuhold.pro",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "MarcBruins",
+      "name": "Marc Bruins",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/676025?v=4",
+      "profile": "http://www.marcbruins.nl",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "Malaprade",
+      "name": "Jarno Malaprade",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/18284078?v=4",
+      "profile": "https://github.com/Malaprade",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "mdameer",
+      "name": "Mohammad Dameer",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/2022320?v=4",
+      "profile": "http://www.mdameer.com",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "axunonb",
+      "name": "axunonb",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/10255664?v=4",
+      "profile": "https://www.axuno.net",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "PimHwang",
+      "name": "Pim Hwang",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/3014302?v=4",
+      "profile": "http://www.coming.com.cn",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "omidnasri",
+      "name": "Omid Nasri",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/11842391?v=4",
+      "profile": "http://www.omidnasri.ir",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "mcoztunc",
+      "name": "Mustafa Can Öztunç",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/2112981?v=4",
+      "profile": "https://github.com/mcoztunc",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "npietron",
+      "name": "npietron",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/17119997?v=4",
+      "profile": "https://github.com/npietron",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "NianJiTao",
+      "name": "nianjitao",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/8943258?v=4",
+      "profile": "http://www.fmtv365.com",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "praedo",
+      "name": "Maksim Zhdan",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/3378144?v=4",
+      "profile": "http://praedo.ru",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "rms81",
+      "name": "KamZone",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1382857?v=4",
+      "profile": "http://umprogramador.net/",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "cesspoolK",
+      "name": "Tommi Sääskilahti",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/49377661?v=4",
+      "profile": "https://www.tommisaaskilahti.fi",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "rgcode2012",
+      "name": "Bnis Profile",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/29854720?v=4",
+      "profile": "http://www.burgan-systems.com",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "valiantzhao",
+      "name": "valiant.zhao",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/2221730?v=4",
+      "profile": "https://github.com/valiantzhao",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "WahidBitar",
+      "name": "Wahid Bitar",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1735126?v=4",
+      "profile": "https://github.com/WahidBitar",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "alexzcx",
+      "name": "Alex Zhao",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/5806994?v=4",
+      "profile": "https://github.com/alexzcx",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "KhoiNguyenICT",
+      "name": "khoinguyenict",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/25011643?v=4",
+      "profile": "https://github.com/KhoiNguyenICT",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "nadavhury",
+      "name": "Nadav Hury",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1974430?v=4",
+      "profile": "https://github.com/nadavhury",
+      "contributions": [
+        "translation"
+      ]
     }
   ],
   "skipCi": true

Contributors.md

@@ -1,7 +1,7 @@
 # Contributors ✨
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-208-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-227-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@@ -56,7 +56,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/wazowsk1"><img src="https://avatars3.githubusercontent.com/u/10253291?v=4" width="100px;" alt=""/><br /><sub><b>Wazowski</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=wazowsk1" title="Code">💻</a></td>
     <td align="center"><a href="https://www.systemsltd.com/"><img src="https://avatars3.githubusercontent.com/u/6080471?v=4" width="100px;" alt=""/><br /><sub><b>Shahid Khan</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=shahid-pk" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/microposmp"><img src="https://avatars1.githubusercontent.com/u/49494169?v=4" width="100px;" alt=""/><br /><sub><b>Magnus Pettersson</b></sub></a><br /><a href="#translation-microposmp" title="Translation">🌍</a> <a href="https://github.com/OrchardCMS/OrchardCore/commits?author=microposmp" title="Code">💻</a></td>
-    <td align="center"><a href="http://www.quartz-scheduler.net/"><img src="https://avatars1.githubusercontent.com/u/171892?v=4" width="100px;" alt=""/><br /><sub><b>Marko Lahma</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=lahma" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.quartz-scheduler.net/"><img src="https://avatars1.githubusercontent.com/u/171892?v=4" width="100px;" alt=""/><br /><sub><b>Marko Lahma</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=lahma" title="Code">💻</a> <a href="#translation-lahma" title="Translation">🌍</a></td>
   </tr>
   <tr>
     <td align="center"><a href="http://www.endlessmountainsolutions.com"><img src="https://avatars0.githubusercontent.com/u/1848585?v=4" width="100px;" alt=""/><br /><sub><b>Jeff Olmstead</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=jeffolmstead" title="Code">💻</a></td>
@@ -287,6 +287,31 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://www.linoa.com"><img src="https://avatars1.githubusercontent.com/u/17902415?v=4" width="100px;" alt=""/><br /><sub><b>Julien Chomarat</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=juchom" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/3bit"><img src="https://avatars1.githubusercontent.com/u/1174592?v=4" width="100px;" alt=""/><br /><sub><b>Achim Gmeiner</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=3bit" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/tropcicstefan"><img src="https://avatars1.githubusercontent.com/u/30324480?v=4" width="100px;" alt=""/><br /><sub><b>tropcicstefan</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=tropcicstefan" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.neuhold.pro"><img src="https://avatars1.githubusercontent.com/u/698992?v=4" width="100px;" alt=""/><br /><sub><b>Benedikt Neuhold</b></sub></a><br /><a href="#translation-benschi11" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://www.marcbruins.nl"><img src="https://avatars1.githubusercontent.com/u/676025?v=4" width="100px;" alt=""/><br /><sub><b>Marc Bruins</b></sub></a><br /><a href="#translation-MarcBruins" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/Malaprade"><img src="https://avatars0.githubusercontent.com/u/18284078?v=4" width="100px;" alt=""/><br /><sub><b>Jarno Malaprade</b></sub></a><br /><a href="#translation-Malaprade" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://www.mdameer.com"><img src="https://avatars3.githubusercontent.com/u/2022320?v=4" width="100px;" alt=""/><br /><sub><b>Mohammad Dameer</b></sub></a><br /><a href="#translation-mdameer" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://www.axuno.net"><img src="https://avatars2.githubusercontent.com/u/10255664?v=4" width="100px;" alt=""/><br /><sub><b>axunonb</b></sub></a><br /><a href="#translation-axunonb" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://www.coming.com.cn"><img src="https://avatars2.githubusercontent.com/u/3014302?v=4" width="100px;" alt=""/><br /><sub><b>Pim Hwang</b></sub></a><br /><a href="#translation-PimHwang" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://www.omidnasri.ir"><img src="https://avatars3.githubusercontent.com/u/11842391?v=4" width="100px;" alt=""/><br /><sub><b>Omid Nasri</b></sub></a><br /><a href="#translation-omidnasri" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/mcoztunc"><img src="https://avatars0.githubusercontent.com/u/2112981?v=4" width="100px;" alt=""/><br /><sub><b>Mustafa Can Öztunç</b></sub></a><br /><a href="#translation-mcoztunc" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/npietron"><img src="https://avatars1.githubusercontent.com/u/17119997?v=4" width="100px;" alt=""/><br /><sub><b>npietron</b></sub></a><br /><a href="#translation-npietron" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://www.fmtv365.com"><img src="https://avatars0.githubusercontent.com/u/8943258?v=4" width="100px;" alt=""/><br /><sub><b>nianjitao</b></sub></a><br /><a href="#translation-NianJiTao" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://praedo.ru"><img src="https://avatars3.githubusercontent.com/u/3378144?v=4" width="100px;" alt=""/><br /><sub><b>Maksim Zhdan</b></sub></a><br /><a href="#translation-praedo" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://umprogramador.net/"><img src="https://avatars1.githubusercontent.com/u/1382857?v=4" width="100px;" alt=""/><br /><sub><b>KamZone</b></sub></a><br /><a href="#translation-rms81" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://www.tommisaaskilahti.fi"><img src="https://avatars2.githubusercontent.com/u/49377661?v=4" width="100px;" alt=""/><br /><sub><b>Tommi Sääskilahti</b></sub></a><br /><a href="#translation-cesspoolK" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://www.burgan-systems.com"><img src="https://avatars2.githubusercontent.com/u/29854720?v=4" width="100px;" alt=""/><br /><sub><b>Bnis Profile</b></sub></a><br /><a href="#translation-rgcode2012" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/valiantzhao"><img src="https://avatars3.githubusercontent.com/u/2221730?v=4" width="100px;" alt=""/><br /><sub><b>valiant.zhao</b></sub></a><br /><a href="#translation-valiantzhao" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/WahidBitar"><img src="https://avatars0.githubusercontent.com/u/1735126?v=4" width="100px;" alt=""/><br /><sub><b>Wahid Bitar</b></sub></a><br /><a href="#translation-WahidBitar" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/alexzcx"><img src="https://avatars1.githubusercontent.com/u/5806994?v=4" width="100px;" alt=""/><br /><sub><b>Alex Zhao</b></sub></a><br /><a href="#translation-alexzcx" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/KhoiNguyenICT"><img src="https://avatars0.githubusercontent.com/u/25011643?v=4" width="100px;" alt=""/><br /><sub><b>khoinguyenict</b></sub></a><br /><a href="#translation-KhoiNguyenICT" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/nadavhury"><img src="https://avatars3.githubusercontent.com/u/1974430?v=4" width="100px;" alt=""/><br /><sub><b>Nadav Hury</b></sub></a><br /><a href="#translation-nadavhury" title="Translation">🌍</a></td>
   </tr>
 </table>
 

src/OrchardCore.Build/Dependencies.props

@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageManagement Include="AngleSharp" Version="0.14.0" />
     <PackageManagement Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.0.2" />
-    <PackageManagement Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.0.1" />
+    <PackageManagement Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.2.0" />
     <PackageManagement Include="Azure.Identity" Version="1.3.0" />
     <PackageManagement Include="Azure.Storage.Blobs" Version="12.7.0" />
     <PackageManagement Include="Castle.Core" Version="4.4.1" />
@@ -33,8 +33,8 @@
     <PackageManagement Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageManagement Include="NLog.Web.AspNetCore" Version="4.9.3" />
     <PackageManagement Include="NodaTime" Version="3.0.3" />
-    <PackageManagement Include="OpenIddict.AspNetCore" Version="[3.0.0-rc2.20607.88]" />
-    <PackageManagement Include="OpenIddict.Core" Version="[3.0.0-rc2.20607.88]" />
+    <PackageManagement Include="OpenIddict.AspNetCore" Version="3.0.0" />
+    <PackageManagement Include="OpenIddict.Core" Version="3.0.0" />
     <PackageManagement Include="OrchardCore.Translations.All" Version="1.0.0-rc2-108003" />
     <PackageManagement Include="Serilog.AspNetCore" Version="3.4.0" />
     <PackageManagement Include="Shortcodes" Version="1.0.0" />

src/OrchardCore.Modules/OrchardCore.ContentLocalization/Views/LocalizationPart.SummaryAdminLinks.cshtml

@@ -3,8 +3,8 @@
 @if (!string.IsNullOrEmpty(Model.LocalizationSet) && Model.ContentItemCultures.Any())
 {
     <div class="btn-group" title="@T["Localizations"]">
-        <button type="button" class="btn btn-sm text-info" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            <i class="fa fa-globe"></i>
+        <button type="button" class="btn btn-sm btn-info dropdown-toggle localizations" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <span>@T["Localizations"]</span>
         </button>
         <div class="dropdown-menu dropdown-menu-right">
             @foreach (var culture in Model.ContentItemCultures)

src/OrchardCore.Modules/OrchardCore.ContentPreview/Views/Preview/Index.cshtml

@@ -5,7 +5,7 @@
 
 <style asp-name="bootstrap"></style>
 <script asp-name="bootstrap" at="Foot"></script>
-<script asp-name="jscookie" at="Foot"></script>
+<script asp-name="js-cookie" at="Foot"></script>
 
 <resources type="Header" />
 

src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/Edit.cshtml

@@ -29,6 +29,13 @@
 
     <input type="hidden" asp-for="Name" />
 
+    @if (Model.Editor.Shortcuts != null)
+    {
+        <div class="form-group">
+            @await DisplayAsync(Model.Editor.Shortcuts)
+        </div>
+    }
+
     @await DisplayAsync(Model.Editor)
 
     <div class="form-group">
@@ -46,11 +53,12 @@
                                 <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@field.Name" class="btn btn-danger btn-sm" role="button" itemprop="UnsafeUrl RemoveUrl">@T["Remove"]</a>
                             </div>
                             @field.DisplayName() <span class="hint dashed">@field.FieldDefinition.Name.CamelFriendly()</span>
+
                             @if (!string.IsNullOrEmpty(field.DisplayMode()))
                             {
-                                <span class="badge ta-badge font-weight-normal" data-toggle="tooltip" title="@T["Display mode"]"><i class="fa fa-eye text-info"></i> @field.DisplayMode()</span>
+                                <span class="badge ta-badge font-weight-normal" data-toggle="tooltip" title="@T["Display mode"]"><i class="fas fa-tv text-info"></i> @field.DisplayMode()</span>
                             }
-                                @if (!string.IsNullOrEmpty(field.Editor()))
+                            @if (!string.IsNullOrEmpty(field.Editor()))
                             {
                                 <span class="badge ta-badge font-weight-normal" data-toggle="tooltip" title="@T["Editor"]"><i class="fa fa-edit text-info"></i> @field.Editor()</span>
                             }
@@ -101,13 +109,6 @@
         <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
         <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
     </div>
-
-    @if (Model.Editor.Shortcuts != null)
-    {
-        <div class="form-group">
-            @await DisplayAsync(Model.Editor.Shortcuts)
-        </div>
-    }
 
     <div class="form-group">
         <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>

src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/EditPart.cshtml

@@ -22,6 +22,13 @@
         <span class="hint">@T["Technical name of the part."]</span>
     </div>
 
+    @if (Model.Editor.Shortcuts != null)
+    {
+        <div class="form-group">
+            @await DisplayAsync(Model.Editor.Shortcuts)
+        </div>
+    }
+
     @await DisplayAsync(Model.Editor)
 
     <div class="form-group">
@@ -49,13 +56,6 @@
     <div class="form-group">
         <a asp-route-action="AddFieldTo" asp-route-id="@Model.PartDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
     </div>
-
-    @if (Model.Editor.Shortcuts != null)
-    {
-        <div class="form-group">
-            @await DisplayAsync(Model.Editor.Shortcuts)
-        </div>
-    }
 
     <div class="form-group">
         <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>