Merge pull request #13648 from abpframework/auto-merge/rel-6-0/1268

Merge branch dev with rel-6.0

.github/workflows/angular.yml

@@ -10,11 +10,17 @@ on:
     branches:
       - 'rel-*'
       - 'dev'
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
 permissions:
   contents: read
 
 jobs:
   build-test-lint:
+    if: ${{ !github.event.pull_request.draft }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/build-and-test.yml

@@ -31,12 +31,18 @@ on:
       - 'templates/**/*.cshtml'
       - 'templates/**/*.csproj'
       - 'templates/**/*.razor'
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
 permissions:
   contents: read
 
 jobs:
   build-test:
     runs-on: windows-latest
+    if: ${{ !github.event.pull_request.draft }}
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-dotnet@master

.github/workflows/codeql-analysis.yml

@@ -9,26 +9,32 @@ on:
   push:
     branches: [dev, rel-*]
     paths:
-      - 'abp/**/*.js'
-      - 'abp/**/*.cs'
-      - 'abp/**/*.cshtml'
-      - 'abp/**/*.csproj'
-      - 'abp/**/*.razor'
+      - "abp/**/*.js"
+      - "abp/**/*.cs"
+      - "abp/**/*.cshtml"
+      - "abp/**/*.csproj"
+      - "abp/**/*.razor"
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [dev]
     paths:
-      - 'abp/**/*.js'
-      - 'abp/**/*.cs'
-      - 'abp/**/*.cshtml'
-      - 'abp/**/*.csproj'
-      - 'abp/**/*.razor'
+      - "abp/**/*.js"
+      - "abp/**/*.cs"
+      - "abp/**/*.cshtml"
+      - "abp/**/*.csproj"
+      - "abp/**/*.razor"
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
 
 permissions:
   contents: read
 
 jobs:
   analyze:
+    if: ${{ !github.event.pull_request.draft }}
     permissions:
       actions: read  # for github/codeql-action/init to get workflow details
       contents: read  # for actions/checkout to fetch code
@@ -41,48 +47,48 @@ jobs:
       matrix:
         # Override automatic language detection by changing the below list
         # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['csharp', 'javascript']
+        language: ["csharp", "javascript"]
         # Learn more...
         # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          # We must fetch at least the immediate parents so that if this is
+          # a pull request then we can checkout the head.
+          fetch-depth: 2
 
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
+      # If this run was triggered by a pull request event, then checkout
+      # the head of the pull request instead of the merge commit.
+      - run: git checkout HEAD^2
+        if: ${{ github.event_name == 'pull_request' }}
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      #- run: |
+      #   make bootstrap
+      #   make release
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

.github/workflows/image-compression.yml

@@ -1,21 +1,26 @@
-name: Compress Images
-on:
-  pull_request:
-    paths:
-      - '**.jpg'
-      - '**.jpeg'
-      - '**.png'
-      - '**.webp'
-jobs:
-  build:
-    if: github.event.pull_request.head.repo.full_name == github.repository
-    name: calibreapp/image-actions
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-
-      - name: Compress Images
-        uses: calibreapp/image-actions@main
-        with:
-          githubToken: ${{ secrets.GITHUB_TOKEN }}
+name: Compress Images
+on:
+  pull_request:
+    paths:
+      - "**.jpg"
+      - "**.jpeg"
+      - "**.png"
+      - "**.webp"
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+jobs:
+  build:
+    if: github.event.pull_request.head.repo.full_name == github.repository && !github.event.pull_request.draft
+    name: calibreapp/image-actions
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+
+      - name: Compress Images
+        uses: calibreapp/image-actions@main
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}

docs/en/Modules/Setting-Management.md

@@ -118,7 +118,13 @@ The order of the providers are important. Providers are executed in the reverse
 
 ## Setting Management UI
 
-Setting Mangement module provided the email setting UI by default, and it is extensible; You can add your tabs to this page for your application settings.
+Setting Mangement module provided the email setting UI by default.
+
+![EmailSettingUi](../images/setting-management-email-ui.png)
+
+> You can click the Send test email button to send a test email to check your email settings.
+
+Setting it is extensible; You can add your tabs to this page for your application settings.
 
 ### MVC UI
 
@@ -302,5 +308,4 @@ export class AppComponent {
 
 Navigate to `/setting-management` route to see the changes:
 
-![Custom Settings Tab](../images/custom-settings.png)
-
+![Custom Settings Tab](../images/custom-settings.png)

docs/zh-Hans/Modules/Setting-Management.md

@@ -87,7 +87,13 @@ namespace Demo
 
 ## Setting Management UI.
 
-设置管理模块默认提供了邮件设置页面并且它是可扩展的; 你可以为你的应用程序设置添加设置标签到设置页面.
+设置管理模块默认提供了邮件设置页面.
+
+![EmailSettingUi](../images/setting-management-email-ui.png)
+
+> 你可以点击发送测试邮件按钮发送一封测试邮件来检查你的邮件设置.
+
+设置UI是可扩展的; 你可以为你的应用程序设置添加设置标签到设置页面.
 
 ### MVC UI