From 0755eb525be8151e11381a152bf824fd55dcb41a Mon Sep 17 00:00:00 2001 From: Erol Arkat Date: Fri, 18 Dec 2020 12:24:59 +0300 Subject: [PATCH 1/5] version update --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index 968de9863e..4ed960a943 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 4.0.1 + 4.0.2 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ From ff740425f9e7c0aeb6917a0892718818f21b3cf1 Mon Sep 17 00:00:00 2001 From: EngincanV Date: Mon, 21 Dec 2020 18:26:50 +0300 Subject: [PATCH 2/5] Fix telerik blazor component article link --- docs/en/Samples/Index.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/en/Samples/Index.md b/docs/en/Samples/Index.md index e0e8c94c45..b5dd0fab29 100644 --- a/docs/en/Samples/Index.md +++ b/docs/en/Samples/Index.md @@ -63,8 +63,7 @@ While there is no Razor Pages & MongoDB combination, you can check both document * **GRPC Demo**: Shows how to add a gRPC service to an ABP Framework based web application and consume it from a console application. * [Source code](https://github.com/abpframework/abp-samples/tree/master/GrpcDemo) * **Telerik Blazor Integration**: Shows how to install and use Telerik Blazor components with the ABP Framework. - * [Source code](https://github.com/abpframework/abp-samples/tree/master/DevExpress-Blazor) - * [Article](https://community.abp.io/articles/using-devexpress-blazor-ui-components-with-the-abp-framework-wrpoa8rw) + * [Article](https://community.abp.io/articles/how-to-integrate-the-telerik-blazor-components-to-the-abp-blazor-ui-q8g31abb) * **Angular Material Integration**: Implemented the web application tutorial using the Angular Material library. * [Source code](https://github.com/abpframework/abp-samples/tree/master/AcmeBookStoreAngularMaterial) * [Article](https://community.abp.io/articles/using-angular-material-components-with-the-abp-framework-af8ft6t9) From e59d64cbb86602f213c8e463a14f41ccd989822f Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 22 Dec 2020 09:58:41 +0800 Subject: [PATCH 3/5] Add localizedText to InnerHtml of small tag. Resolve #6724 --- .../TagHelpers/Form/AbpInputTagHelperService.cs | 1 + .../TagHelpers/Form/AbpSelectTagHelperService.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs index adb50d7382..246c611533 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs @@ -317,6 +317,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form var small = new TagBuilder("small"); small.Attributes.Add("id", idAttr?.Value?.ToString() + "InfoText"); small.AddCssClass("form-text text-muted"); + small.InnerHtml.Append(localizedText); return small.ToHtmlString(); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs index e24aa6d37b..dde58ed3e4 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs @@ -233,6 +233,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form var small = new TagBuilder("small"); small.Attributes.Add("id", idAttr?.Value?.ToString() + "InfoText"); small.AddCssClass("form-text text-muted"); + small.InnerHtml.Append(localizedText); return small.ToHtmlString(); } From 4a0f22d1279794f76adf736bf25484bdcd7795ca Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 22 Dec 2020 17:27:51 +0300 Subject: [PATCH 4/5] Create auto-pr.yml --- .github/workflows/auto-pr.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/auto-pr.yml diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml new file mode 100644 index 0000000000..723e575f75 --- /dev/null +++ b/.github/workflows/auto-pr.yml @@ -0,0 +1,24 @@ +name: Merge branch dev with rel-4.1 +on: + push: + branches: + - rel-4.1 +jobs: + merge-dev-with-rel-4-1: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + ref: dev + - name: Reset promotion branch + run: | + git fetch origin $GITHUB_REF:$GITHUB_REF + git reset --hard $GITHUB_REF + - name: Create Pull Request + uses: peter-evans/create-pull-request@v3 + with: + branch: auto-rel-merge-pr-${{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. + reviewers: ${{github.actor}} + token: ${{ github.token }} From 3a532833edeb042d30d8e4cae33c15ee8b7e032c Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 22 Dec 2020 17:55:36 +0300 Subject: [PATCH 5/5] Create auto-pr.yml --- .github/workflows/auto-pr.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/auto-pr.yml diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml new file mode 100644 index 0000000000..1446c0365b --- /dev/null +++ b/.github/workflows/auto-pr.yml @@ -0,0 +1,24 @@ +name: Merge branch rel-4.1 with rel-4.0 +on: + push: + branches: + - rel-4.0 +jobs: + merge-rel-4-1-with-rel-4-0: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + ref: rel-4.1 + - name: Reset promotion branch + run: | + git fetch origin rel-4.0:rel-4.0 + git reset --hard rel-4.0 + - name: Create Pull Request + uses: peter-evans/create-pull-request@v3 + with: + branch: auto-rel-4-0-merge-pr-${{github.run_number}} + title: Merge branch rel-4.1 with ${{github.ref}} + body: This PR generated automatically to merge rel-4.1 with rel-4.0. Please review the changed files before merging to prevent any errors that may occur. + reviewers: ${{github.actor}} + token: ${{ github.token }}