diff --git a/.changes/unreleased/Feature-20231107-160435.yaml b/.changes/unreleased/Feature-20231107-160435.yaml deleted file mode 100644 index e7976d27e..000000000 --- a/.changes/unreleased/Feature-20231107-160435.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: Feature -body: 'Export: add a filter "filter activity by creator job"' -time: 2023-11-07T16:04:35.921093231+01:00 -custom: - Issue: "194" diff --git a/.changes/unreleased/Fixed-20231107-144039.yaml b/.changes/unreleased/Fixed-20231107-144039.yaml deleted file mode 100644 index 2292b8adb..000000000 --- a/.changes/unreleased/Fixed-20231107-144039.yaml +++ /dev/null @@ -1,6 +0,0 @@ -kind: Fixed -body: 'Export: fix "group accompanying period by geographical unit": take into account - the accompanying periods when the period is not located within an unit' -time: 2023-11-07T14:40:39.46483404+01:00 -custom: - Issue: "185" diff --git a/.changes/unreleased/Fixed-20231107-160702.yaml b/.changes/unreleased/Fixed-20231107-160702.yaml deleted file mode 100644 index 46ac4810d..000000000 --- a/.changes/unreleased/Fixed-20231107-160702.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: Fixed -body: Fix "group activity by creator job" aggregator -time: 2023-11-07T16:07:02.576354444+01:00 -custom: - Issue: "" diff --git a/.changes/v2.11.0.md b/.changes/v2.11.0.md new file mode 100644 index 000000000..ff215159b --- /dev/null +++ b/.changes/v2.11.0.md @@ -0,0 +1,6 @@ +## v2.11.0 - 2023-11-07 +### Feature +* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job" +### Fixed +* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit +* Fix "group activity by creator job" aggregator diff --git a/CHANGELOG.md b/CHANGELOG.md index 66fe4341e..99a16fea2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), and is generated by [Changie](https://github.com/miniscruff/changie). +## v2.11.0 - 2023-11-07 +### Feature +* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job" +### Fixed +* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit +* Fix "group activity by creator job" aggregator + ## 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