From 9f41a9eff931a0945bf54d2df3ae496a2f0d5020 Mon Sep 17 00:00:00 2001 From: Divesh Pahuja Date: Wed, 17 May 2023 12:36:04 +0200 Subject: [PATCH 1/6] [Task] Integrate POEditor Translation Workflow - resolves #400 --- .github/workflows/poeditor-export.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/poeditor-export.yml diff --git a/.github/workflows/poeditor-export.yml b/.github/workflows/poeditor-export.yml new file mode 100644 index 00000000..ef756b61 --- /dev/null +++ b/.github/workflows/poeditor-export.yml @@ -0,0 +1,22 @@ +name: "Trigger POEditor Translations Export" + +on: + workflow_dispatch: + push: + branches: + - "[0-9]+.x" + paths: + - 'src/Resources/translations/admin.en.yml' + +permissions: + contents: read + +jobs: + poeditor: + runs-on: ubuntu-latest + steps: + - name: Trigger workflow in pimcore/poeditor-export-action + env: + GH_TOKEN: ${{ secrets.POEDITOR_ACTION_TRIGGER_TOKEN }} + run: | + gh workflow run -R pimcore/poeditor-export-action poeditor-export.yaml From 0aa1a40dbfb60ff05f4d659d70a9e8794d381d8e Mon Sep 17 00:00:00 2001 From: Kamil Bechta Date: Sat, 30 Sep 2023 14:04:50 +0200 Subject: [PATCH 2/6] Update 05_Example_Usecases.md Typo fix --- doc/30_Personalization/05_Example_Usecases.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/30_Personalization/05_Example_Usecases.md b/doc/30_Personalization/05_Example_Usecases.md index 40edc89f..9544c5c4 100644 --- a/doc/30_Personalization/05_Example_Usecases.md +++ b/doc/30_Personalization/05_Example_Usecases.md @@ -13,7 +13,7 @@ doing so, a target group with the same name is automatically created and linked When using targeting rules with the `Assign Target Group` action, besides assigning target group to the current visitor, there are also options to store the connected segment to the current customer and track activities. -Storing the segement to the customer is necessary to persist this information for later visits of the customer, especially +Storing the segment to the customer is necessary to persist this information for later visits of the customer, especially when the customer visits from a different device. ![VIP Customer Rule](../img/assign-target-group-vip-customer.jpg) From 6ccff3acf797b870c35cfa5372a632f2bf5e4d41 Mon Sep 17 00:00:00 2001 From: JiaJia Ji Date: Mon, 18 Dec 2023 14:06:23 +0100 Subject: [PATCH 3/6] [Task] Replace deprecated `formatLocalized` with `isoFormat` (#515) * replace deprecated formatLocalized with isoFormat * fix typo --- src/View/Formatter/DefaultViewFormatter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/View/Formatter/DefaultViewFormatter.php b/src/View/Formatter/DefaultViewFormatter.php index 355f3075..ca58b77a 100644 --- a/src/View/Formatter/DefaultViewFormatter.php +++ b/src/View/Formatter/DefaultViewFormatter.php @@ -148,10 +148,10 @@ public function formatDatetimeValue($value, $dateOnly = false) $date = Carbon::parse($value); if ($dateOnly) { - return $date->formatLocalized('%x'); + return $date->isoFormat('LL'); } - return $date->formatLocalized('%x %X'); + return $date->isoFormat('LLL'); } /** From 4bccfeb4563938a6f68569bbe182c287a351c6e5 Mon Sep 17 00:00:00 2001 From: Shonster88 Date: Mon, 22 Jan 2024 09:56:38 +0100 Subject: [PATCH 4/6] Created stale.yml bot --- .github/workflows/stale.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 00000000..553c3b57 --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,10 @@ +name: Handle stale issues + +on: + workflow_dispatch: + schedule: + - cron: '37 7 * * *' + +jobs: + call-stale-workflow: + uses: pimcore/workflows-collection-public/.github/workflows/stale.yml@v1.1.0 From b586deed97d2f01967c57dbb672fc71b9c714739 Mon Sep 17 00:00:00 2001 From: Valentin Date: Fri, 22 Mar 2024 09:01:35 +0100 Subject: [PATCH 5/6] Add original customer id check (#516) --- src/CustomerSaveManager/DefaultCustomerSaveManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CustomerSaveManager/DefaultCustomerSaveManager.php b/src/CustomerSaveManager/DefaultCustomerSaveManager.php index 126603dc..687888a8 100644 --- a/src/CustomerSaveManager/DefaultCustomerSaveManager.php +++ b/src/CustomerSaveManager/DefaultCustomerSaveManager.php @@ -128,7 +128,7 @@ protected function rememberOriginalCustomer(CustomerInterface $customer) $originalCustomer = null; } - if ($originalCustomerNeeded) { + if ($originalCustomerNeeded && $customer->getId()) { $originalCustomer = $this->customerProvider->getById($customer->getId(), true); } From aba0c11819d753c2808bf9d7dd279ec9df904925 Mon Sep 17 00:00:00 2001 From: markus-moser Date: Fri, 5 Apr 2024 09:19:55 +0200 Subject: [PATCH 6/6] Update cla checker --- .github/workflows/cla-check.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/cla-check.yaml diff --git a/.github/workflows/cla-check.yaml b/.github/workflows/cla-check.yaml new file mode 100644 index 00000000..d56f7ff2 --- /dev/null +++ b/.github/workflows/cla-check.yaml @@ -0,0 +1,12 @@ +name: CLA check +on: + issue_comment: + types: [created] + pull_request_target: + types: [opened, closed, synchronize] +jobs: + cla-workflow: + uses: pimcore/workflows-collection-public/.github/workflows/reusable-cla-check.yaml@v1.3.0 + if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' + secrets: + CLA_ACTION_ACCESS_TOKEN: ${{ secrets.CLA_ACTION_ACCESS_TOKEN }}