From 241733de0198de070f9ec1326a0f483626de3342 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Tue, 11 Apr 2023 17:17:19 +0300 Subject: [PATCH 1/3] Fix date pipe names --- docs/en/UI/Angular/DateTime-Format-Pipe.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en/UI/Angular/DateTime-Format-Pipe.md b/docs/en/UI/Angular/DateTime-Format-Pipe.md index 199a2da76c..599fb5a3f2 100644 --- a/docs/en/UI/Angular/DateTime-Format-Pipe.md +++ b/docs/en/UI/Angular/DateTime-Format-Pipe.md @@ -14,21 +14,21 @@ ShortDate, ShortTime and ShortDateTime format data like angular's data pipe but # ShortDate Pipe ```html - {{today | shortDatePipe }} + {{today | shortDate }} ``` # ShortTime Pipe ```html - {{today | shortTimePipe }} + {{today | shortTime }} ``` # ShortDateTime Pipe ```html - {{today | shortDateTimePipe }} + {{today | shortDateTime }} ``` }%} \ No newline at end of file From d1dc5d52f92fa002438d6a32452b4c7df20f2536 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Wed, 12 Apr 2023 13:29:02 +0300 Subject: [PATCH 2/3] update auto-pr for rel-7.1 --- .github/workflows/auto-pr.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 1babddae5a..7746b35ba8 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,4 +1,4 @@ -name: Merge branch dev with rel-7.1 +name: Merge branch rel-7.2 with rel-7.1 on: push: branches: @@ -7,7 +7,7 @@ permissions: contents: read jobs: - merge-dev-with-rel-7-1: + merge-rel-7.2-with-rel-7-1: permissions: contents: write # for peter-evans/create-pull-request to create branch pull-requests: write # for peter-evans/create-pull-request to create a PR @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: dev + ref: rel-7.2 - name: Reset promotion branch run: | git fetch origin rel-7.1:rel-7.1 @@ -24,7 +24,7 @@ jobs: uses: peter-evans/create-pull-request@v3 with: branch: auto-merge/rel-7-1/${{github.run_number}} - title: Merge branch dev with rel-7.1 - body: This PR generated automatically to merge dev with rel-7.1. Please review the changed files before merging to prevent any errors that may occur. + title: Merge branch rel-7.2 with rel-7.1 + body: This PR generated automatically to merge rel-7.2 with rel-7.1. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }} From 2ce1f794ccded513ff900bcfd9d222158c23396c Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Wed, 12 Apr 2023 13:39:08 +0300 Subject: [PATCH 3/3] fix dot problem --- .github/workflows/auto-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 7746b35ba8..92121c4fe8 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -7,7 +7,7 @@ permissions: contents: read jobs: - merge-rel-7.2-with-rel-7-1: + merge-rel-7-2-with-rel-7-1: permissions: contents: write # for peter-evans/create-pull-request to create branch pull-requests: write # for peter-evans/create-pull-request to create a PR