Skip to content

Commit fe5e339

Browse files
authored
Merge pull request #5 from eea/develop
Refs #158294 - Enable volto-eea-map block.
2 parents 9ffbac7 + 6ae0b7e commit fe5e339

File tree

3 files changed

+732
-9
lines changed

3 files changed

+732
-9
lines changed

CHANGELOG.md

+22
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,22 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7+
### [1.2.0](https://github.com/eea/cca-frontend/compare/1.1.0...1.2.0) - 11 January 2023
8+
9+
#### :hammer_and_wrench: Others
10+
11+
- Refs #158294 - Enable volto-eea-map block. [GhitaB - [`e196a71`](https://github.com/eea/cca-frontend/commit/e196a71454a93e4440c5d8014271ee910d72410e)]
712
### [1.1.0](https://github.com/eea/cca-frontend/compare/1.0.0-alpha.2...1.1.0) - 10 January 2023
813

914
#### :rocket: Dependency updates
1015

16+
- Release @eeacms/volto-eea-kitkat@10.5.0 [EEA Jenkins - [`137b9e5`](https://github.com/eea/cca-frontend/commit/137b9e543eba573dc1bbdebf64c76e16293183db)]
17+
- Release @eeacms/volto-eea-website-theme@1.5.0 [EEA Jenkins - [`e1d691d`](https://github.com/eea/cca-frontend/commit/e1d691deb3074da05432cd52b942696c7561137d)]
18+
- Release @eeacms/volto-eea-website-theme@1.4.2 [EEA Jenkins - [`a9d9e36`](https://github.com/eea/cca-frontend/commit/a9d9e36706464167b4f2e23a8e16f9e6d1fada78)]
19+
- Release @eeacms/volto-eea-website-theme@1.4.1 [EEA Jenkins - [`6880c55`](https://github.com/eea/cca-frontend/commit/6880c557812e2911e39116b0da1fe81bf42c3ae3)]
20+
- Release @eeacms/volto-eea-kitkat@10.4.0 [EEA Jenkins - [`863071f`](https://github.com/eea/cca-frontend/commit/863071f6a72885d8277dde31be4cfa2b88cb768c)]
21+
- Release @eeacms/volto-eea-website-theme@1.4.0 [EEA Jenkins - [`5643ded`](https://github.com/eea/cca-frontend/commit/5643ded4468d9ebd81289431d54e86e9fc8e5217)]
22+
- Release @eeacms/volto-cca-policy@0.1.3 [EEA Jenkins - [`5306f1c`](https://github.com/eea/cca-frontend/commit/5306f1c2164c3dc7676527dcff42f7a566d7042f)]
1123

1224
#### :hammer_and_wrench: Others
1325

@@ -22,9 +34,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
2234

2335
#### :rocket: Dependency updates
2436

37+
- Release @eeacms/volto-eea-kitkat@10.3.0 [EEA Jenkins - [`c8f68b3`](https://github.com/eea/cca-frontend/commit/c8f68b3d3787cf579c6cb215c7803081d6ee441d)]
38+
- Release @eeacms/volto-eea-website-theme@1.3.2 [EEA Jenkins - [`263045c`](https://github.com/eea/cca-frontend/commit/263045c0cb2f42676831fa7cfe555ed08bc215ef)]
2539

2640
#### :hammer_and_wrench: Others
2741

42+
- Refs #158294 - Try fix Jenkins errors. [GhitaB - [`6a27f54`](https://github.com/eea/cca-frontend/commit/6a27f5424320966bee934aecfa7086f5365c60c0)]
43+
- Add empty CHANGELOG.md file [EEA Jenkins - [`09ce500`](https://github.com/eea/cca-frontend/commit/09ce50059a8e3148b4c54ad9f414d95dbca22ac1)]
2844
### [1.0.0-alpha.1](https://github.com/eea/cca-frontend/compare/0.1.1...1.0.0-alpha.1) - 13 December 2022
2945

3046
### [0.1.1](https://github.com/eea/cca-frontend/compare/0.1.0...0.1.1) - 13 December 2022
@@ -33,10 +49,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
3349

3450
#### :rocket: Dependency updates
3551

52+
- Release @eeacms/volto-cca-policy@0.1.1 [EEA Jenkins - [`a7305a8`](https://github.com/eea/cca-frontend/commit/a7305a88bd6f873cc791b352f732f7fca97c0122)]
3653

3754
#### :hammer_and_wrench: Others
3855

56+
- Refs #158294 - Try fix Jenkins errors - activate Integration tests. [GhitaB - [`ca2a7a3`](https://github.com/eea/cca-frontend/commit/ca2a7a3a2729a668a2d3dd27730452c655c9d5d8)]
3957
- Added volto-cca-policy to package.json dependencies [laszlocseh - [`cb422a2`](https://github.com/eea/cca-frontend/commit/cb422a26d00e8ca75799fa3115edf5c3ec6a90c8)]
58+
- Update Jenkinsfile [Laszlo Cseh - [`77553c8`](https://github.com/eea/cca-frontend/commit/77553c8bee44ff99761ee0b977663ffd580e8ac1)]
59+
- Update Jenkinsfile [Alexandru Ghica - [`32fd613`](https://github.com/eea/cca-frontend/commit/32fd61300b30d19a5ef06c6872bd927d53c90f5b)]
60+
- Update Jenkinsfile [Alexandru Ghica - [`e81fd8c`](https://github.com/eea/cca-frontend/commit/e81fd8c4bebd8040aee4229c65f8eea3ec1db63b)]
4061
- Use seamless mode [Tiberiu Ichim - [`b7c12b1`](https://github.com/eea/cca-frontend/commit/b7c12b1fed0f222db1bf6aaed8de939563f58d42)]
4162
- Adjustments [Tiberiu Ichim - [`9d3272c`](https://github.com/eea/cca-frontend/commit/9d3272c70ee9c54a32e2497a28c067e7a1dd7f30)]
4263
- Don't need entrypoint override [Tiberiu Ichim - [`8d15a3d`](https://github.com/eea/cca-frontend/commit/8d15a3d95a959d3827bb6497b40ca750e8c5251c)]
@@ -47,6 +68,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
4768
- Add submodule [Tiberiu Ichim - [`6331347`](https://github.com/eea/cca-frontend/commit/63313471a1ffad2b12c580a1c6710adcfe3df700)]
4869
- Add memcached [Tiberiu Ichim - [`57f9e72`](https://github.com/eea/cca-frontend/commit/57f9e729ab26b14167b50092b4dbdb0f3e2e5843)]
4970
- Improve docker-compose.yml; bring in theme.js [Tiberiu Ichim - [`2749c30`](https://github.com/eea/cca-frontend/commit/2749c300bcfe5e7101cb373e8d15f6bfda317f15)]
71+
- Update yarn lock [Tiberiu Ichim - [`2727383`](https://github.com/eea/cca-frontend/commit/2727383288715b8a00bcd86b4181842a0a3ee80b)]
5072
- Set develop [Tiberiu Ichim - [`275e22e`](https://github.com/eea/cca-frontend/commit/275e22e9193f5734a8de43402040212e8ee93dcf)]
5173
- Add volto-eea-website-theme [Tiberiu Ichim - [`c65de81`](https://github.com/eea/cca-frontend/commit/c65de814e6b3c2317e1f6f7f1ec0da5b94dbb00a)]
5274
- Load eea-website-theme [Tiberiu Ichim - [`ae2f0ef`](https://github.com/eea/cca-frontend/commit/ae2f0ef3f8956985d723db5929ea9a70ded63fac)]

package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "cca-frontend",
33
"description": "CCA frontend (Plone 4)",
44
"license": "MIT",
5-
"version": "1.1.0",
5+
"version": "1.2.0",
66
"scripts": {
77
"start": "razzle start",
88
"postinstall": "make omelette && make patches",
@@ -49,7 +49,8 @@
4949
"@eeacms/volto-eea-kitkat",
5050
"@eeacms/volto-eea-design-system",
5151
"@eeacms/volto-eea-website-theme",
52-
"@eeacms/volto-cca-policy"
52+
"@eeacms/volto-cca-policy",
53+
"@eeacms/volto-eea-map"
5354
],
5455
"jest": {
5556
"modulePathIgnorePatterns": [
@@ -155,6 +156,7 @@
155156
"@eeacms/volto-cca-policy": "0.1.3",
156157
"@eeacms/volto-eea-design-system": "1.0.0-alpha.9",
157158
"@eeacms/volto-eea-kitkat": "10.5.0",
159+
"@eeacms/volto-eea-map": "*",
158160
"@eeacms/volto-eea-website-theme": "1.5.0",
159161
"@plone/volto": "16.6.0",
160162
"volto-subsites": "4.0.0"

0 commit comments

Comments
 (0)