Skip to content

Commit

Permalink
Merge pull request #43 from eea/develop
Browse files Browse the repository at this point in the history
Use latest volto
  • Loading branch information
razvanMiu committed Aug 22, 2022
2 parents 604a9bf + 041c25c commit 2f6e3fd
Show file tree
Hide file tree
Showing 4 changed files with 251 additions and 2,313 deletions.
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,34 @@ 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).

#### [3.13.0](https://github.com/eea/industry-frontend/compare/3.12.0...3.13.0)

- Release @eeacms/volto-industry-theme@2.0.5 [`9793654`](https://github.com/eea/industry-frontend/commit/97936542e123ab2bd768d3b21b466160e14c2e3c)
- Merge master into develop [`3f399f0`](https://github.com/eea/industry-frontend/commit/3f399f0de5789d1a00d0127160b5b4cd92027e5d)
- Update addons + use volto 16 [`07d02d2`](https://github.com/eea/industry-frontend/commit/07d02d2125681498c4da455d27590bd4843ce301)
- Release @eeacms/volto-eea-kitkat@6.2.3 [`d4657e7`](https://github.com/eea/industry-frontend/commit/d4657e78f525d7d795244188a2974df7af005e95)
- Release @eeacms/volto-eea-kitkat@6.2.2 [`c7e6431`](https://github.com/eea/industry-frontend/commit/c7e6431360647589ac5aae612be5541c8f738eb2)
- Release @eeacms/volto-eea-kitkat@6.2.1 [`aa8c450`](https://github.com/eea/industry-frontend/commit/aa8c45070d5819f7cc302ada442d119e2edfae24)
- Release @eeacms/volto-eea-kitkat@6.2.0 [`a0ff6c2`](https://github.com/eea/industry-frontend/commit/a0ff6c2163d2af718892a0ad33b324bc4486957b)
- Release volto-slate@6.2.2 - resolutions [`2b9d8f4`](https://github.com/eea/industry-frontend/commit/2b9d8f40045b24c55038e5d7904700f1864f9a52)
- Release volto-slate@6.2.1 - resolutions [`fbf970b`](https://github.com/eea/industry-frontend/commit/fbf970b756c728f0c284414da4f6d5b1df2e5544)
- Release @eeacms/volto-eea-kitkat@6.1.4 [`4b0e4bc`](https://github.com/eea/industry-frontend/commit/4b0e4bc80053cb25cf579f0030a603889cded803)
- Release @eeacms/volto-eea-kitkat@6.1.3 [`7e98992`](https://github.com/eea/industry-frontend/commit/7e9899291edd6f5f466975d684ba13a885f12d37)
- Release @eeacms/volto-eea-kitkat@6.1.2 [`97edfd5`](https://github.com/eea/industry-frontend/commit/97edfd5ccbd44ea3ebb545af9b11177195168c4e)
- Release @eeacms/volto-eea-kitkat@6.1.1 [`dd3ba81`](https://github.com/eea/industry-frontend/commit/dd3ba8133f3cc12fbe715d3e47b0be948837db60)
- Release @eeacms/volto-eea-kitkat@6.1.0 [`1847e9a`](https://github.com/eea/industry-frontend/commit/1847e9a3ae9783f39fa23e7b6b64c36a204cd5f3)
- Release @eeacms/volto-eea-kitkat@6.0.4 [`0f06131`](https://github.com/eea/industry-frontend/commit/0f061317830b7f164e5a22fcd75528055956c6bd)
- Release volto-slate@6.2.0 - resolutions [`f9fdb24`](https://github.com/eea/industry-frontend/commit/f9fdb24e80624388a02e00359a0bcced83a3e7a9)
- Release @eeacms/volto-eea-kitkat@6.0.3 [`bc55350`](https://github.com/eea/industry-frontend/commit/bc5535072d026a123a5179f90849664a0056025a)
- Release @eeacms/volto-eea-kitkat@6.0.2 [`5d08c94`](https://github.com/eea/industry-frontend/commit/5d08c94bc76b21e2f1a355350bc3fa24573aa4e3)
- Release @eeacms/volto-eea-kitkat@6.0.1 [`2002b22`](https://github.com/eea/industry-frontend/commit/2002b22c72975196ba1bb034824caf9a769dedcb)
- Release volto-slate@6.1.0 - resolutions [`27de088`](https://github.com/eea/industry-frontend/commit/27de088abfa1ac64d84cbbc0c70339f28b32a18f)

#### [3.12.0](https://github.com/eea/industry-frontend/compare/3.11.0...3.12.0)

> 20 May 2022
- Add-ons updates [`#42`](https://github.com/eea/industry-frontend/pull/42)
- Release @eeacms/volto-eea-kitkat@6.0.0 [`e9c830d`](https://github.com/eea/industry-frontend/commit/e9c830d5c8fba25c212335c1a7cc0ee331b337e5)
- Release volto-slate@6.0.1 - resolutions [`21a028b`](https://github.com/eea/industry-frontend/commit/21a028b071925c78884483b9ea373f08aa7a9834)
- Release volto-slate@6.0.0 - resolutions [`6ea4a4a`](https://github.com/eea/industry-frontend/commit/6ea4a4ae257c519f94c37bb68e82a5889fd48150)
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/industry-frontend?sort=semver)](https://github.com/eea/industry-frontend/releases)
[![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/master/lastBuild/display/redirect)
[![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/develop/lastBuild/display/redirect)
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2F3.12.0&build=last&subject=release%20v3.12.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/3.12.0/lastBuild/display/redirect/)
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2F3.13.0&build=last&subject=release%20v3.13.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/3.13.0/lastBuild/display/redirect/)


## Documentation
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@eeacms/industry-frontend",
"description": "Volto-based frontend server and SPA for the Industrial Emissions Portal website (former EPRTR) industry.eea.europa.eu",
"license": "MIT",
"version": "3.12.0",
"version": "3.13.0",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
"homepage": "https://github.com/eea/industry-frontend",
Expand Down Expand Up @@ -153,7 +153,7 @@
},
"dependencies": {
"@eeacms/volto-eea-kitkat": "6.2.0",
"@eeacms/volto-industry-theme": "2.0.4",
"@eeacms/volto-industry-theme": "2.0.5",
"@plone/volto": "16.0.0-alpha.14"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit 2f6e3fd

Please sign in to comment.