From 3a269ba9535d1ff1c3505ab333e077a48664a3d7 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Tue, 7 Nov 2023 13:28:11 +0100 Subject: [PATCH] update changelog --- .changes/unreleased/Fixed-20231030-115441.yaml | 5 ----- .changes/unreleased/Fixed-20231106-220250.yaml | 5 ----- .changes/v2.10.6.md | 4 ++++ CHANGELOG.md | 10 ++++++++++ 4 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 .changes/unreleased/Fixed-20231030-115441.yaml delete mode 100644 .changes/unreleased/Fixed-20231106-220250.yaml create mode 100644 .changes/v2.10.6.md diff --git a/.changes/unreleased/Fixed-20231030-115441.yaml b/.changes/unreleased/Fixed-20231030-115441.yaml deleted file mode 100644 index 144658fff..000000000 --- a/.changes/unreleased/Fixed-20231030-115441.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: Fixed -body: Fix merging of double person files. Adjustement relationship sql statement -time: 2023-10-30T11:54:41.028058144+01:00 -custom: - Issue: "182" diff --git a/.changes/unreleased/Fixed-20231106-220250.yaml b/.changes/unreleased/Fixed-20231106-220250.yaml deleted file mode 100644 index dee206de1..000000000 --- a/.changes/unreleased/Fixed-20231106-220250.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: Fixed -body: 'Export: fix aggregator by geographical unit on person: avoid inconsistencies' -time: 2023-11-06T22:02:50.364184265+01:00 -custom: - Issue: "185" diff --git a/.changes/v2.10.6.md b/.changes/v2.10.6.md new file mode 100644 index 000000000..7dafcca91 --- /dev/null +++ b/.changes/v2.10.6.md @@ -0,0 +1,4 @@ +## v2.10.6 - 2023-11-07 +### Fixed +* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement +* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c8a4356f..66fe4341e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,16 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), and is generated by [Changie](https://github.com/miniscruff/changie). +## v2.10.6 - 2023-11-07 +### Fixed +* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement +* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies + +## v2.10.5 - 2023-11-05 +### Fixed +* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type +* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date" + ## v2.10.4 - 2023-10-26 ### Fixed * Fix null value constraint errors when merging relationships in doubles