Merge branch 'master' into PHRAS-3770_quarantine-enhancement

alchemy-fr · Aug 8, 2023 · 039e14e · 039e14e
2 parents ff7d36b + 4913579
commit 039e14e
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 20 deletions.
diff --git 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
@@ -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/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
diff --git 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

diff --git 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);