Skip to content

Commit

Permalink
Merge pull request #20 from eea/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
laszlocseh authored Aug 1, 2023
2 parents 163db96 + 550a3c0 commit 22f2d1c
Show file tree
Hide file tree
Showing 4 changed files with 220 additions and 208 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,25 @@ 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.12.0](https://github.com/eea/marine-frontend/compare/1.11.0...1.12.0) - 1 August 2023

#### :rocket: Dependency updates

- Release @eeacms/volto-eea-kitkat@17.0.0 [EEA Jenkins - [`14fca9c`](https://github.com/eea/marine-frontend/commit/14fca9cdfe8778a2c847f291b57a62619ba82c1e)]
- Release @eeacms/volto-searchlib@0.6.0 [EEA Jenkins - [`a9a8666`](https://github.com/eea/marine-frontend/commit/a9a86664a6e88335044e9fe854f23666f56e8e81)]
- Release @eeacms/volto-tableau@5.0.0 [EEA Jenkins - [`ad006ab`](https://github.com/eea/marine-frontend/commit/ad006ab4072f7b09eea665379b7f43dbe01edf95)]
- Release @eeacms/volto-datablocks@6.0.0 [EEA Jenkins - [`ca1605d`](https://github.com/eea/marine-frontend/commit/ca1605dd85aedbb8aabfe13f1322077129599a0f)]
- Release @eeacms/volto-embed@6.0.0 [EEA Jenkins - [`06d715a`](https://github.com/eea/marine-frontend/commit/06d715a35611836e90012e08c6e6cef3248ef8e3)]
- Release @eeacms/volto-slate-dataentity@3.0.0 [EEA Jenkins - [`7971ed5`](https://github.com/eea/marine-frontend/commit/7971ed5015792ed8aaa641542e1d2cad157f8872)]
- Release @eeacms/volto-eea-kitkat@16.1.0 [EEA Jenkins - [`f6b0bc8`](https://github.com/eea/marine-frontend/commit/f6b0bc84996ce2d08530a874ef293c057c6f340b)]
- Release @eeacms/volto-banner@3.1.3 [EEA Jenkins - [`294b966`](https://github.com/eea/marine-frontend/commit/294b966ed4cd486fb7fa816aa7cdc79a1255ddc3)]
- Release @eeacms/volto-widget-geolocation@5.1.2 [EEA Jenkins - [`b930a39`](https://github.com/eea/marine-frontend/commit/b930a392560e77558d30bae3d517cbe8115a3927)]
- Release @eeacms/volto-tableau@4.1.1 [EEA Jenkins - [`a3b0404`](https://github.com/eea/marine-frontend/commit/a3b0404988752429486a3969031a3da37cf490a4)]

#### :house: Documentation changes

- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`93cd5c1`](https://github.com/eea/marine-frontend/commit/93cd5c101b183fd00440491dd74390fe55b55c23)]

### [1.11.0](https://github.com/eea/marine-frontend/compare/1.10.0...1.11.0) - 18 July 2023

#### :rocket: Dependency updates
Expand All @@ -12,9 +31,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :house: Internal changes

- chore: [YARN] Automated update of yarn.lock [EEA Jenkins - [`88ccb29`](https://github.com/eea/marine-frontend/commit/88ccb29a5e46cb3685dd5d3a5891ee770a30ee1d)]

#### :house: Documentation changes

- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`49e7445`](https://github.com/eea/marine-frontend/commit/49e7445fe7dcba4f794ed06e171d553945a75409)]

#### :hammer_and_wrench: Others

Expand Down Expand Up @@ -70,6 +91,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :house: Documentation changes

- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`e7e08d9`](https://github.com/eea/marine-frontend/commit/e7e08d9cdbd0235b84ab38d9a8f3fd86f23c64a5)]

#### :hammer_and_wrench: Others

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Release](https://img.shields.io/github/v/release/eea/marine-frontend?sort=semver)](https://github.com/eea/marine-frontend/releases)
[![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fmarine-frontend%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/marine-frontend/job/master/lastBuild/display/redirect)
[![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fmarine-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/marine-frontend/job/develop/lastBuild/display/redirect)
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fmarine-frontend%2F0.3.0&build=last&subject=release%20.3.0.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/marine-frontend/job/1.11.0/lastBuild/display/redirect/)
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fmarine-frontend%2F0.3.0&build=last&subject=release%20.3.0.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/marine-frontend/job/1.12.0/lastBuild/display/redirect/)

## Documentation

Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "marine-frontend",
"description": "A Volto-powered Plone frontend",
"license": "MIT",
"version": "1.11.0",
"version": "1.12.0",
"scripts": {
"start": "razzle start",
"analyze": "webpack-bundle-analyzer -p $PORT -h 0.0.0.0 ./build/public/stats.json",
Expand Down Expand Up @@ -47,7 +47,7 @@
"resolutions": {
"d3-array": "2.12.1",
"classnames": "2.2.6",
"@eeacms/volto-searchlib": "0.5.8",
"@eeacms/volto-searchlib": "0.6.0",
"@eeacms/volto-block-image-cards": "github:eea/volto-block-image-cards#1.1.0"
},
"addons": [
Expand All @@ -63,18 +63,18 @@
],
"dependencies": {
"@babel/plugin-transform-react-jsx": "*",
"@eeacms/volto-banner": "3.1.2",
"@eeacms/volto-datablocks": "5.0.2",
"@eeacms/volto-eea-kitkat": "16.0.4",
"@eeacms/volto-embed": "5.0.4",
"@eeacms/volto-banner": "3.1.3",
"@eeacms/volto-datablocks": "6.0.0",
"@eeacms/volto-eea-kitkat": "17.0.0",
"@eeacms/volto-embed": "6.0.0",
"@eeacms/volto-marine-theme": "0.1.21",
"@eeacms/volto-measurescatalog": "0.1.3",
"@eeacms/volto-searchlib": "0.5.8",
"@eeacms/volto-slate-dataentity": "2.1.0",
"@eeacms/volto-searchlib": "0.6.0",
"@eeacms/volto-slate-dataentity": "3.0.0",
"@eeacms/volto-slots": "0.1.2",
"@eeacms/volto-tableau": "4.1.0",
"@eeacms/volto-tableau": "5.0.0",
"@eeacms/volto-widget-dataprovenance": "0.3.3",
"@eeacms/volto-widget-geolocation": "5.1.1",
"@eeacms/volto-widget-geolocation": "5.1.2",
"@plone/volto": "16.5.0",
"react-compound-slider": "3.3.1",
"react-motion": "0.5.2",
Expand Down
Loading

0 comments on commit 22f2d1c

Please sign in to comment.