From 9fd03e01f9caf88f1e436d0f240d5773a308f77f Mon Sep 17 00:00:00 2001
From: nmaillat <maillat@alchemy.fr>
Date: Thu, 10 Aug 2023 16:21:45 +0200
Subject: [PATCH 1/2] prepare bump version

---
 .env                                 |  2 +-
 CHANGELOG.md                         | 21 +++++++++++++++++++++
 lib/Alchemy/Phrasea/Core/Version.php |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index be38e1c6ca..80272828fb 100644
--- a/.env
+++ b/.env
@@ -133,7 +133,7 @@ PHRASEANET_DOCKER_REGISTRY=local
 
 # Docker images tag.
 # @run
-PHRASEANET_DOCKER_TAG=4.1.8-rc5
+PHRASEANET_DOCKER_TAG=4.1.8-rc6
 
 # Stack Name
 # An optionnal Name for the stack
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d27a7ecc46..b9314f2392 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # CHANGELOG
 
+## 4.1.8-rc6
+
+### 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)
+
+ - PHP setting improvement 
+ - FPM setting improvement 
+ 
+### What's Changed
+
+(todo)
+
+
 ## 4.1.8-rc5
 
 ### Update instructions
diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php
index eab14c1789..ed7b9b1805 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-rc5';
+    private $number = '4.1.8-rc6';
 
     /**
      * @var string

From e9c1d6c2810a7615f9fe6a6fd9ebc62849fc5a02 Mon Sep 17 00:00:00 2001
From: Nicolas Maillat <maillat@alchemy.fr>
Date: Tue, 12 Sep 2023 14:25:54 +0200
Subject: [PATCH 2/2] PHRAS-3901 Update CHANGELOG.md

---
 CHANGELOG.md | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9314f2392..b64eebf933 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,20 +5,29 @@
 ### Update instructions
 
 - Migration patch: no patch to play, just run upgrade for bump version 
-- Elasticsearch index action : none
+- Elasticsearch index action : a "drop", "create", "populate" of elasticsearch index can be useful.
 
 ### Version summary
   
- - bugfix an minor improvement (todo)
+ - Improvement and bugfix
 
 ### Stack (docker compose)
 
  - PHP setting improvement 
  - FPM setting improvement 
  
-### What's Changed
+## What's Changed
+* PHRAS-3893 prod - advanced search - control calendar missing for created_on and updated_on by @aynsix in https://github.com/alchemy-fr/Phraseanet/pull/4360
+* PHRAS-3785 update composer dependencies for imagine by @moctardiouf in https://github.com/alchemy-fr/Phraseanet/pull/4362
+* PHRAS-3252 Prod - Export - The captions are not being sent when doing an export by email by @aynsix in https://github.com/alchemy-fr/Phraseanet/pull/4363
+* PHRAS-3387 php fpm optimization by @moctardiouf in https://github.com/alchemy-fr/Phraseanet/pull/4364
+* PHRAS-3890: Admin - add "auth failure" - display and purge auth failure - only for super U by @aynsix in https://github.com/alchemy-fr/Phraseanet/pull/4368
+* PHRAS-3903 Admin - object inspector - record index debug tools by @aynsix in https://github.com/alchemy-fr/Phraseanet/pull/4369
+* PHRAS-3904 Add server port on fastcgi - SAML multi provider support https conf by @moctardiouf in https://github.com/alchemy-fr/Phraseanet/pull/4370
+* PHRAS-3889 Worker - metadata write - mime/type whitelist - write metadatas only on whitelisted files by @aynsix in https://github.com/alchemy-fr/Phraseanet/pull/4366
+
 
-(todo)
+**Full Changelog**: https://github.com/alchemy-fr/Phraseanet/compare/4.1.8-rc5...4.1.8-rc6
 
 
 ## 4.1.8-rc5