diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index c8e8663069..987a3ada1b 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,10 +1,10 @@ -name: Merge branch dev with rel-4.1 +name: Merge branch dev with rel-4.2 on: push: branches: - - rel-4.1 + - rel-4.2 jobs: - merge-dev-with-rel-4-1: + merge-dev-with-rel: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -17,8 +17,8 @@ jobs: - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-4-1/${{github.run_number}} - title: Merge branch dev with rel-4.1 - body: This PR generated automatically to merge dev with rel-4.1. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/rel-4-2/${{github.run_number}} + title: Merge branch dev with rel-4.2 + body: This PR generated automatically to merge dev with rel-4.2. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }} diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json index a29355b401..a92c20a991 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json @@ -37,7 +37,7 @@ "CreateArticleTitleInfo": "Title of the article to be shown on the article list.", "CreateArticleUrlInfo": "Original GitHub/External URL of the article.", "CreateArticleSummaryInfo": "A short summary of the article to be shown on the article list.", - "CreateArticleCoverInfo": "For creating an effective article, add a cover photo. Upload 16:9 aspect ratio pictures for the best view.", + "CreateArticleCoverInfo": "For creating an effective article, add a cover photo. Upload 16:9 aspect ratio pictures for the best view. Maximum file size: 1MB.", "ThisExtensionIsNotAllowed": "This extension is not allowed.", "TheFileIsTooLarge": "The file is too large.", "GoToTheArticle": "Go to the Article", diff --git a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/POST.md b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/POST.md index 4bdebb6234..971eb88f97 100644 --- a/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/POST.md +++ b/docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/POST.md @@ -52,7 +52,10 @@ abp new TelerikComponents --ui blazor --database-provider ef ```html ... - + +