Merge pull request #3 from OrchardCMS/dev

Updated the branch
OrchardCMS · Apr 18, 2021 · b4fb161 · b4fb161
2 parents 77d64be + b012f5a
commit b4fb161
Show file tree

Hide file tree

Showing 110 changed files with 1,400 additions and 1,376 deletions.
diff --git a/.github/workflows/functional_all_db.yml b/.github/workflows/functional_all_db.yml
@@ -10,7 +10,7 @@ jobs:
     name: Functional Tests - MVC
     runs-on: ubuntu-latest
     container:
-      image: cypress/included:7.0.1
+      image: cypress/included:7.1.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.0.1
+      image: cypress/included:7.1.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.0.1
+      image: cypress/included:7.1.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.0.1
+      image: cypress/included:7.1.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.0.1
+      image: cypress/included:7.1.0
     services:
       mssql:
         image: mcr.microsoft.com/mssql/server:2019-latest

diff --git a/NuGet.config b/NuGet.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <clear />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
     <!-- This feed should not be used when shipping on NuGet. It should just be used in the dev branch while dependencies are not available on NuGet.org -->
     <!--<add key="OrchardCore" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" />-->

diff --git a/README.md b/README.md
@@ -14,8 +14,7 @@ Orchard Core consists of two distinct projects:
 
 Stable (master): 
 
-[![Build Status](https://api.travis-ci.org/OrchardCMS/OrchardCore.svg?branch=master)](https://travis-ci.org/OrchardCMS/OrchardCore/branches)
-[![Build status](https://img.shields.io/appveyor/ci/alexbocharov/orchardcore/master.svg?label=appveyor&style=flat-square)](https://ci.appveyor.com/project/alexbocharov/orchardcore/branch/master)
+[![Build status](https://github.com/OrchardCMS/OrchardCore/workflows/Release%20-%20CI/badge.svg?branch=master)](https://github.com/OrchardCMS/OrchardCore/actions?query=workflow%3A%22Release+-+CI%22)
 [![NuGet](https://img.shields.io/nuget/v/OrchardCore.Application.Cms.Targets.svg)](https://www.nuget.org/packages/OrchardCore.Application.Cms.Targets)
 
 Nightly (dev): 

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -91,6 +91,7 @@ nav:
         - Understanding Content Definitions Stores: docs/guides/content-definitions/README.md 
         - Change password configuration: docs/guides/password-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: 
         - Manage your Content: docs/topics/content-management/README.md
         - Customize the Display: docs/topics/display/README.md