From f3002631ea6f2b9ce832a1e9322a761de09a9b81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 26 Mar 2024 18:10:18 +0100
Subject: [PATCH] Release 2.18.0

---
 .changes/unreleased/Feature-20240326-170418.yaml |  5 -----
 .changes/unreleased/Fixed-20240320-123527.yaml   |  6 ------
 .changes/v2.18.0.md                              |  5 +++++
 CHANGELOG.md                                     | 16 ++++++++++++++++
 4 files changed, 21 insertions(+), 11 deletions(-)
 delete mode 100644 .changes/unreleased/Feature-20240326-170418.yaml
 delete mode 100644 .changes/unreleased/Fixed-20240320-123527.yaml
 create mode 100644 .changes/v2.18.0.md

diff --git a/.changes/unreleased/Feature-20240326-170418.yaml b/.changes/unreleased/Feature-20240326-170418.yaml
deleted file mode 100644
index f86f55d96..000000000
--- a/.changes/unreleased/Feature-20240326-170418.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-kind: Feature
-body: Improve admin UX to configure document templates for document generation
-time: 2024-03-26T17:04:18.351694753+01:00
-custom:
-  Issue: "268"
diff --git a/.changes/unreleased/Fixed-20240320-123527.yaml b/.changes/unreleased/Fixed-20240320-123527.yaml
deleted file mode 100644
index a9e13ae9e..000000000
--- a/.changes/unreleased/Fixed-20240320-123527.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: 'Fix the join between job and user in the user list (admin): show only the current
-  user job'
-time: 2024-03-20T12:35:27.885282599+01:00
-custom:
-  Issue: "267"
diff --git a/.changes/v2.18.0.md b/.changes/v2.18.0.md
new file mode 100644
index 000000000..ad52d1d87
--- /dev/null
+++ b/.changes/v2.18.0.md
@@ -0,0 +1,5 @@
+## v2.18.0 - 2024-03-26
+### Feature
+* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation 
+### Fixed
+* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f5d91ddc..a022a870d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,22 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v2.18.0 - 2024-03-26
+### Feature
+* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation 
+### Fixed
+* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job 
+
+## v2.17.0 - 2024-03-19
+### Feature
+* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates 
+* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course 
+* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields 
+* ([#159](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/159)) Admin can publish news on the homepage
+### Fixed
+* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill 
+* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period 
+
 ## v2.16.3 - 2024-02-26
 ### Fixed
 * ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier'