From f3f8bd718b02a0a3024fcec44013320ca8e2496c Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Fri, 4 Aug 2023 09:57:55 +0200 Subject: [PATCH 1/3] PHRAS-3888 release 4.1.8-rc5 (#4357) * bump version * changelog --- .env | 2 +- CHANGELOG.md | 36 +++++++++++++++++++++++++++- lib/Alchemy/Phrasea/Core/Version.php | 2 +- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 17dc0e12d5..514fa4cd81 100644 --- a/.env +++ b/.env @@ -133,7 +133,7 @@ PHRASEANET_DOCKER_REGISTRY=local # Docker images tag. # @run -PHRASEANET_DOCKER_TAG=4.1.8-rc4 +PHRASEANET_DOCKER_TAG=4.1.8-rc5 # Stack Name # An optionnal Name for the stack diff --git a/CHANGELOG.md b/CHANGELOG.md index a819586ad0..d27a7ecc46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,39 @@ # CHANGELOG +## 4.1.8-rc5 + +### Update instructions + +- Migration patch: no patch to play, just run upgrade for bump version +- Elasticsearch index action : none + +### Version summary + + - bugfix an minor improvement (todo) + +### Stack (docker compose) + + - Extend csp for GA-4 (todo) + +### What's Changed + +* PHRAS-3882 admin - workers - filter "consumed queue" in https://github.com/alchemy-fr/Phraseanet/pull/4347 +* PHRAS-3884 translation and advanced search field name in https://github.com/alchemy-fr/Phraseanet/pull/4348 +* PHRAS-3416 phraseanet localization in https://github.com/alchemy-fr/Phraseanet/pull/4350 +* PHRAS-3796 bin/setup check:system - download , lazaret, wrong repo is checked in https://github.com/alchemy-fr/Phraseanet/pull/4349 +* PHRAS-3851 Untranslated terms : in Notifications, Detailed View, Map by in https://github.com/alchemy-fr/Phraseanet/pull/4351 +* PHRAS-3416 phraseanet localization in https://github.com/alchemy-fr/Phraseanet/pull/4353 +* PHRAS-3887 google analytics 4 by in https://github.com/alchemy-fr/Phraseanet/pull/4354 +* PHRAS-3884 advanced search sort field by label by in https://github.com/alchemy-fr/Phraseanet/pull/4355 +* PHRAS-3870_record-action-example by in https://github.com/alchemy-fr/Phraseanet/pull/4334 +* PHRAS-3891 CSP policies for matomo cloud and newrelic by in https://github.com/alchemy-fr/Phraseanet/pull/4358 +* PHRAS-3891 adding CSP in https://github.com/alchemy-fr/Phraseanet/pull/4359 + + +**Full Changelog**: https://github.com/alchemy-fr/Phraseanet/compare/4.1.8-rc4...4.1.8-rc5 + + + ## 4.1.8-rc4 ### Update instructions @@ -9,7 +43,7 @@ ### Version summary -- bugfix an minor improvement +- bugfix an minor improvement ### Stack (docker compose) diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index 53f60a04ed..eab14c1789 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -17,7 +17,7 @@ class Version * @var string */ - private $number = '4.1.8-rc4'; + private $number = '4.1.8-rc5'; /** * @var string From e28cfb5e3b93a1e49f9d0f40d954c6f14ce29661 Mon Sep 17 00:00:00 2001 From: Aina Sitraka <35221835+aynsix@users.noreply.github.com> Date: Fri, 4 Aug 2023 20:01:11 +0300 Subject: [PATCH 2/3] fix advanced search date control calendar (#4360) --- lib/Alchemy/Phrasea/Helper/Prod.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/Alchemy/Phrasea/Helper/Prod.php b/lib/Alchemy/Phrasea/Helper/Prod.php index 1f7a1d8248..3badb97f98 100644 --- a/lib/Alchemy/Phrasea/Helper/Prod.php +++ b/lib/Alchemy/Phrasea/Helper/Prod.php @@ -157,8 +157,10 @@ public function get_search_datas() // add default field date $dates['updated_on']['sbas'] = $allSbasId; + $dates['updated_on']['fieldname'] = 'updated_on'; $dates['updated_on']['label'][] = $this->app->trans('updated_on'); $dates['created_on']['sbas'] = $allSbasId; + $dates['created_on']['fieldname'] = 'created_on'; $dates['created_on']['label'][] = $this->app->trans('created_on'); $f = $this->getLabels($fields); From ecb39683d690c12438c2500cb1ee5d75ec08926c Mon Sep 17 00:00:00 2001 From: Moctar Date: Mon, 7 Aug 2023 15:33:45 +0200 Subject: [PATCH 3/3] update composer dependencies for imagine --- composer.json | 4 ++-- composer.lock | 33 ++++++++++++++++++--------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index 198d508cc3..5b96873016 100644 --- a/composer.json +++ b/composer.json @@ -89,14 +89,14 @@ "hoa/dispatcher": "~0.0", "hoa/router": "~2.0", "igorw/get-in": "~1.0", - "imagine/imagine": "0.6.x-dev", + "imagine/imagine": "0.9.0", "jms/serializer": "~0.10", "jms/translation-bundle": "dev-fix-2021-04-19", "justinrainbow/json-schema": "2.0.3 as 1.6.1", "league/flysystem": "^1.0", "league/flysystem-aws-s3-v2": "^1.0", "league/fractal": "dev-webgalleries#af1acc0275438571bc8c1d08a05a4b5af92c9f97 as 0.13.0", - "media-alchemyst/media-alchemyst": "^0.5.6", + "media-alchemyst/media-alchemyst": "^0.5.7", "monolog/monolog": "~1.3", "mrclay/minify": "~2.1.6", "neutron/process-manager": "2.0.x-dev@dev", diff --git a/composer.lock b/composer.lock index 3f4ba3637d..0a03c50c83 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a155d517a61963f9dd96d3f3a2c22d21", + "content-hash": "eadceda3244b4c8a1890620dbbdd655b", "packages": [ { "name": "alchemy-fr/tcpdf-clone", @@ -3706,16 +3706,16 @@ }, { "name": "imagine/imagine", - "version": "0.6.x-dev", + "version": "v0.9.0", "source": { "type": "git", "url": "https://github.com/alchemy-fr/Imagine.git", - "reference": "6605d13e3b24f335fe80099c193546671158c041" + "reference": "94dc35d33d5730d5ad2031c3b17fc9761a29d322" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/Imagine/zipball/6605d13e3b24f335fe80099c193546671158c041", - "reference": "6605d13e3b24f335fe80099c193546671158c041", + "url": "https://api.github.com/repos/alchemy-fr/Imagine/zipball/94dc35d33d5730d5ad2031c3b17fc9761a29d322", + "reference": "94dc35d33d5730d5ad2031c3b17fc9761a29d322", "shasum": "" }, "require": { @@ -3759,9 +3759,9 @@ "image processing" ], "support": { - "source": "https://github.com/alchemy-fr/Imagine/tree/alchemy-0.6.2" + "source": "https://github.com/alchemy-fr/Imagine/tree/v0.9.0" }, - "time": "2015-01-13T18:12:26+00:00" + "time": "2022-12-01T14:36:05+00:00" }, { "name": "ircmaxell/password-compat", @@ -4343,22 +4343,22 @@ }, { "name": "media-alchemyst/media-alchemyst", - "version": "0.5.6", + "version": "0.5.7", "source": { "type": "git", "url": "https://github.com/alchemy-fr/Media-Alchemyst.git", - "reference": "2b9f7697997f7863bbc3d08344c559a1cba519c2" + "reference": "5c7277ccdab03dd34dea13bec4ac1f4e5963ac94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/2b9f7697997f7863bbc3d08344c559a1cba519c2", - "reference": "2b9f7697997f7863bbc3d08344c559a1cba519c2", + "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/5c7277ccdab03dd34dea13bec4ac1f4e5963ac94", + "reference": "5c7277ccdab03dd34dea13bec4ac1f4e5963ac94", "shasum": "" }, "require": { "alchemy/ghostscript": "~0.4.0", "alchemy/mediavorus": "^0.4.4", - "imagine/imagine": "^0.6.2", + "imagine/imagine": "^0.9.0", "monolog/monolog": "~1.0", "neutron/temporary-filesystem": "^2.1.1", "php": ">=5.3.3", @@ -4413,7 +4413,11 @@ "video", "video processing" ], - "time": "2020-04-01T08:51:55+00:00" + "support": { + "issues": "https://github.com/alchemy-fr/Media-Alchemyst/issues", + "source": "https://github.com/alchemy-fr/Media-Alchemyst/tree/0.5.7" + }, + "time": "2023-08-07T12:59:05+00:00" }, { "name": "monolog/monolog", @@ -8720,7 +8724,6 @@ "stability-flags": { "alchemy/task-manager": 20, "doctrine/cache": 20, - "imagine/imagine": 20, "jms/translation-bundle": 20, "league/fractal": 20, "neutron/process-manager": 20, @@ -8733,5 +8736,5 @@ "ext-intl": "*" }, "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" }