Skip to content

Commit

Permalink
Merge pull request #57 from eea/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
GhitaB authored Aug 7, 2023
2 parents 5a8b250 + 8f69251 commit 5ebb935
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 10 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file. Dates are d

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

### [1.47.0](https://github.com/eea/cca-frontend/compare/1.46.0...1.47.0) - 7 August 2023

#### :rocket: Dependency updates

- Release @eeacms/volto-cca-policy@0.1.35 [EEA Jenkins - [`065db29`](https://github.com/eea/cca-frontend/commit/065db29fcbbc60330e16c20723d731ac9112cbc1)]
- Release @eeacms/volto-cca-policy@0.1.34 [EEA Jenkins - [`0a01c65`](https://github.com/eea/cca-frontend/commit/0a01c656fae5bf37a554d3b5dc7fcc7950cb8e90)]
- Release @eeacms/volto-nextcloud-video-block@0.4.4 [EEA Jenkins - [`c97a0ea`](https://github.com/eea/cca-frontend/commit/c97a0eafe7e3db29633ae0a5e7172e3c7e700387)]

#### :hammer_and_wrench: Others

- Refs #161501 - Update yarn.lock. [GhitaB - [`6d9831e`](https://github.com/eea/cca-frontend/commit/6d9831e4b5a8e76bf694bff44f13fb69f5ff9243)]
- Refs #161501 - Use develop branch for volto-nextcloud-video-block. [GhitaB - [`c807451`](https://github.com/eea/cca-frontend/commit/c807451950bf796a05afe2333d7a00c2a55cc846)]
- Refs #161501 - Use develop branch for volto-nextcloud-video-block. [GhitaB - [`7ef6a3e`](https://github.com/eea/cca-frontend/commit/7ef6a3e7768fe49ac7ed8649177a54e3b58d6c1b)]
### [1.46.0](https://github.com/eea/cca-frontend/compare/1.45.0...1.46.0) - 1 August 2023

#### :rocket: Dependency updates
Expand Down
2 changes: 1 addition & 1 deletion mrs.developer.json
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
"url": "[email protected]:eea/volto-nextcloud-video-block",
"https": "https://github.com/eea/volto-nextcloud-video-block.git",
"package": "@eeacms/volto-nextcloud-video-block",
"branch": "add_title",
"branch": "develop",
"develop": true,
"path": "src"
},
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "cca-frontend",
"description": "CCA frontend (Plone 4)",
"license": "MIT",
"version": "1.46.0",
"version": "1.47.0",
"scripts": {
"start": "razzle start",
"postinstall": "make omelette && make patches",
Expand Down Expand Up @@ -166,13 +166,13 @@
},
"dependencies": {
"@eeacms/volto-accordion-block": "9.3.0",
"@eeacms/volto-cca-policy": "0.1.33",
"@eeacms/volto-cca-policy": "0.1.35",
"@eeacms/volto-eea-design-system": "1.15.0",
"@eeacms/volto-eea-kitkat": "17.0.0",
"@eeacms/volto-eea-website-theme": "1.18.1",
"@eeacms/volto-embed": "6.0.0",
"@eeacms/volto-globalsearch": "^1.0.15",
"@eeacms/volto-nextcloud-video-block": "0.4.3",
"@eeacms/volto-nextcloud-video-block": "0.4.4",
"@eeacms/volto-openlayers-map": "0.3.0",
"@eeacms/volto-widget-dataprovenance": "0.3.3",
"@eeacms/volto-widget-geolocation": "5.1.2",
Expand Down
21 changes: 15 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1889,9 +1889,9 @@ __metadata:
languageName: node
linkType: hard

"@eeacms/volto-cca-policy@npm:0.1.33":
version: 0.1.33
resolution: "@eeacms/volto-cca-policy@npm:0.1.33"
"@eeacms/volto-cca-policy@npm:0.1.35":
version: 0.1.35
resolution: "@eeacms/volto-cca-policy@npm:0.1.35"
dependencies:
"@eeacms/volto-accordion-block": "*"
"@eeacms/volto-eea-design-system": "*"
Expand All @@ -1902,7 +1902,7 @@ __metadata:
"@eeacms/volto-widget-temporal-coverage": "*"
d3: 3
d3-geo: 3
checksum: 3c88d6c4f9258c2fb99bc52154c1bd568144d20e11a43206831a0a1bc13c3c7bfcfb38a71e48da000491178e0bcc17f9c867a1a77d0352e35aa6b22f43d5ca9e
checksum: aea4d666de5c17889ca25e443c75eed0550e51c37b713ec96038f5504699dd832b33921e823f3865250fe7857dc831ff28559c09b31e39386a8b81b453ae721a
languageName: node
linkType: hard

Expand Down Expand Up @@ -2115,6 +2115,15 @@ __metadata:
languageName: node
linkType: hard

"@eeacms/volto-nextcloud-video-block@npm:0.4.4":
version: 0.4.4
resolution: "@eeacms/volto-nextcloud-video-block@npm:0.4.4"
dependencies:
"@eeacms/volto-object-widget": "*"
checksum: bcab391dc7affd26a13a5feb76fd920fdb9ababa8460161c7e62d2b6d907605d4cb772894bb5af756cc957735793fafef43a918804ef5408753b735247cd2a80
languageName: node
linkType: hard

"@eeacms/volto-object-widget@npm:*":
version: 5.1.1
resolution: "@eeacms/volto-object-widget@npm:5.1.1"
Expand Down Expand Up @@ -8555,13 +8564,13 @@ __metadata:
dependencies:
"@cypress/code-coverage": ^3.10.0
"@eeacms/volto-accordion-block": 9.3.0
"@eeacms/volto-cca-policy": 0.1.33
"@eeacms/volto-cca-policy": 0.1.35
"@eeacms/volto-eea-design-system": 1.15.0
"@eeacms/volto-eea-kitkat": 17.0.0
"@eeacms/volto-eea-website-theme": 1.18.1
"@eeacms/volto-embed": 6.0.0
"@eeacms/volto-globalsearch": ^1.0.15
"@eeacms/volto-nextcloud-video-block": 0.4.3
"@eeacms/volto-nextcloud-video-block": 0.4.4
"@eeacms/volto-openlayers-map": 0.3.0
"@eeacms/volto-widget-dataprovenance": 0.3.3
"@eeacms/volto-widget-geolocation": 5.1.2
Expand Down

0 comments on commit 5ebb935

Please sign in to comment.