Skip to content

Commit 2477191

Browse files
avoineaavoinea
authored
Merge pull request #14 from eea/develop
Release
2 parents a5c1cfa + d83954e commit 2477191

File tree

6 files changed

+130
-101
lines changed

6 files changed

+130
-101
lines changed

‎CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,35 @@ 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+
#### [0.8.0](https://github.com/eea/eea-website-frontend/compare/0.7.0...0.8.0)
8+
9+
- Release @eeacms/volto-eea-kitkat@6.0.0 [`2900b3b`](https://github.com/eea/eea-website-frontend/commit/2900b3bd2596a9185ea0f27cf761a2338b9e54c1)
10+
- Release @eeacms/volto-eea-design-system@0.3.1 [`6758253`](https://github.com/eea/eea-website-frontend/commit/67582530905654a86ffe83ee60da2c911d37af52)
11+
- Release @eeacms/volto-eea-website-theme@0.6.0 [`a3cbca0`](https://github.com/eea/eea-website-frontend/commit/a3cbca0e61c629e2b00a832d618ae61e0dadd0e4)
12+
- Release @eeacms/volto-quote-block@0.2.0 [`f3e68f7`](https://github.com/eea/eea-website-frontend/commit/f3e68f7b3b80f3e20268b7b684c922523b47f074)
13+
- Release @eeacms/volto-description-block@0.2.0 [`156c28a`](https://github.com/eea/eea-website-frontend/commit/156c28adeb114497b2826d449ac3e86b3a8f5a8a)
14+
- Release @eeacms/volto-tags-block@0.2.2 [`4d37d2b`](https://github.com/eea/eea-website-frontend/commit/4d37d2bb82aa6680ef84a5fe01c35b3ee915d568)
15+
- Release @eeacms/volto-eea-design-system@0.3.0 [`42bd7f4`](https://github.com/eea/eea-website-frontend/commit/42bd7f4301c50ebbd52a487596c904222e1dedd8)
16+
- Release @eeacms/volto-tags-block@0.2.1 [`e38ae47`](https://github.com/eea/eea-website-frontend/commit/e38ae478f859b253038bec567775618ae5feb93f)
17+
- Release @eeacms/volto-quote-block@0.1.2 [`0d84d55`](https://github.com/eea/eea-website-frontend/commit/0d84d55478a58973d6c87b9575223b8551ad2d5a)
18+
- Release @eeacms/volto-eea-website-theme@0.5.4 [`c6dde81`](https://github.com/eea/eea-website-frontend/commit/c6dde81ee28e3061a8c060f8d4a5c5a2e8c29eef)
19+
- Release @eeacms/volto-description-block@0.1.3 [`08b52f8`](https://github.com/eea/eea-website-frontend/commit/08b52f8e62f9f58f4d0142d7fc794309cf7f4a86)
20+
- Remove volto-progress-block - refs #147873 [`13fbc1a`](https://github.com/eea/eea-website-frontend/commit/13fbc1ae4f4e746bc659b6fde4f1a27e3f97bc00)
21+
- Release @plone/volto 15.11.0 [`3f99ebe`](https://github.com/eea/eea-website-frontend/commit/3f99ebefca8e8038b1743289500658ba00a7db24)
22+
- Release @eeacms/volto-eea-design-system@0.2.4 [`52b5795`](https://github.com/eea/eea-website-frontend/commit/52b5795bd73260b5adac9282e4f32ffd117b99f9)
23+
- Release @eeacms/volto-eea-kitkat@5.4.1 [`32e490f`](https://github.com/eea/eea-website-frontend/commit/32e490f5c6490787cbec003a1dabd2606baa007f)
24+
- Add volto-quote-block instead of volto-blockquote [`9e17463`](https://github.com/eea/eea-website-frontend/commit/9e17463133145c2cb8a5bd4bc034a2bd564b36a7)
25+
- Release @eeacms/volto-eea-design-system@0.2.3 [`6f06897`](https://github.com/eea/eea-website-frontend/commit/6f0689789c536bc1bab7bb043d196d0d32b7140a)
26+
- Release @plone/volto 15.7.0 [`79edcae`](https://github.com/eea/eea-website-frontend/commit/79edcae4f3a30c3f3518fff872df308e2ec27886)
27+
- Release @plone/volto 15.6.1 [`710f6c9`](https://github.com/eea/eea-website-frontend/commit/710f6c9d26b224162900c4c71b0dacf935fabd66)
28+
- Fix broken symlink inside volto [`a5571d3`](https://github.com/eea/eea-website-frontend/commit/a5571d3d67de7b04db0d8f8fe51e83fdc5fd2f97)
29+
- Add volto-description-block [`f56fde6`](https://github.com/eea/eea-website-frontend/commit/f56fde6fb6bf7e4f469bac96866b29bd9409bf87)
30+
731
#### [0.7.0](https://github.com/eea/eea-website-frontend/compare/0.6.0...0.7.0)
832

33+
> 22 April 2022
34+
35+
- Release [`#12`](https://github.com/eea/eea-website-frontend/pull/12)
936
- Revert "Revert "Temporarily disable faulty cypress"" [`2b78a9a`](https://github.com/eea/eea-website-frontend/commit/2b78a9a3944c7b5bd3585ea8a70d00e5e4f8493e)
1037
- Release @eeacms/volto-eea-website-theme@0.5.3 [`28f161e`](https://github.com/eea/eea-website-frontend/commit/28f161eb3ec8d5ca01c199179e2de8a9b90b55f8)
1138
- Release @eeacms/volto-eea-design-system@0.2.2 [`c6cce75`](https://github.com/eea/eea-website-frontend/commit/c6cce75ee12129d5a71ade5467eaa7543c40816a)

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[![Release](https://img.shields.io/github/v/release/eea/eea-website-frontend?sort=semver)](https://github.com/eea/eea-website-frontend/releases)
33
[![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto/eea-website-frontend/master&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/eea-website-frontend/job/master/display/redirect)
44
[![Pipeline develop](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Feea-website-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/eea-website-frontend/job/develop/lastBuild/display/redirect)
5-
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Feea-website-frontend%2F0.7.0&build=last&subject=release%20v0.7.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/eea-website-frontend/job/0.7.0/lastBuild/display/redirect/)
5+
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Feea-website-frontend%2F0.8.0&build=last&subject=release%20v0.8.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/eea-website-frontend/job/0.8.0/lastBuild/display/redirect/)
66

77
## Documentation
88

‎jsconfig.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,23 @@
9191
"@eeacms/volto-eea-website-policy": [
9292
"addons/volto-eea-website-policy/src"
9393
],
94-
"@eeacms/volto-blockquote": [
95-
"addons/volto-blockquote/src"
94+
"@eeacms/volto-quote-block": [
95+
"addons/volto-quote-block/src"
9696
],
9797
"@eeacms/volto-statistic-block": [
9898
"addons/volto-statistic-block/src"
9999
],
100100
"@eeacms/volto-timeline-block": [
101101
"addons/volto-timeline-block/src"
102102
],
103-
"@eeacms/volto-progress-block": [
104-
"addons/volto-progress-block/src"
105-
],
106103
"@eeacms/volto-slate-label": [
107104
"addons/volto-slate-label/src"
108105
],
109106
"@eeacms/volto-tags-block": [
110107
"addons/volto-tags-block/src"
108+
],
109+
"@eeacms/volto-description-block": [
110+
"addons/volto-description-block/src"
111111
]
112112
},
113113
"baseUrl": "src"

‎mrs.developer.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,10 @@
239239
"develop": true,
240240
"path": "src"
241241
},
242-
"volto-blockquote": {
243-
"url": "git@github.com:eea/volto-blockquote.git",
244-
"https": "https://github.com/eea/volto-blockquote.git",
245-
"package": "@eeacms/volto-blockquote",
242+
"volto-quote-block": {
243+
"url": "git@github.com:eea/volto-quote-block.git",
244+
"https": "https://github.com/eea/volto-quote-block.git",
245+
"package": "@eeacms/volto-quote-block",
246246
"branch": "develop",
247247
"develop": true,
248248
"path": "src"
@@ -263,14 +263,6 @@
263263
"develop": true,
264264
"path": "src"
265265
},
266-
"volto-progress-block": {
267-
"url": "git@github.com:eea/volto-progress-block.git",
268-
"https": "https://github.com/eea/volto-progress-block.git",
269-
"package": "@eeacms/volto-progress-block",
270-
"branch": "develop",
271-
"develop": true,
272-
"path": "src"
273-
},
274266
"volto-slate-label": {
275267
"url": "git@github.com:eea/volto-slate-label.git",
276268
"https": "https://github.com/eea/volto-slate-label.git",
@@ -286,5 +278,13 @@
286278
"branch": "develop",
287279
"develop": true,
288280
"path": "src"
281+
},
282+
"volto-description-block": {
283+
"url": "git@github.com:eea/volto-description-block.git",
284+
"https": "https://github.com/eea/volto-description-block.git",
285+
"package": "@eeacms/volto-description-block",
286+
"branch": "develop",
287+
"develop": true,
288+
"path": "src"
289289
}
290290
}

‎package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"name": "eea-website-frontend",
33
"description": "EEA Main Website frontend (Plone 6)",
44
"license": "MIT",
5-
"version": "0.7.0",
5+
"version": "0.8.0",
66
"scripts": {
77
"start": "razzle start",
88
"postinstall": "yarn omelette && yarn patches",
9-
"omelette": "ln -sf node_modules/@plone/volto/ omelette",
9+
"omelette": "if [ ! -d omelette ]; then ln -sf node_modules/@plone/volto omelette; fi",
1010
"patches": "/bin/bash patches/patchit.sh > /dev/null 2>&1 ||true",
1111
"build": "razzle build",
1212
"lint": "./node_modules/eslint/bin/eslint.js 'src/**/*.{js,jsx}'",
@@ -47,12 +47,12 @@
4747
],
4848
"addons": [
4949
"@eeacms/volto-eea-kitkat",
50-
"@eeacms/volto-blockquote",
51-
"@eeacms/volto-progress-block",
50+
"@eeacms/volto-quote-block",
5251
"@eeacms/volto-statistic-block",
5352
"@eeacms/volto-tags-block",
5453
"@eeacms/volto-timeline-block",
5554
"@eeacms/volto-slate-label",
55+
"@eeacms/volto-description-block",
5656
"@eeacms/volto-eea-design-system",
5757
"@eeacms/volto-eea-website-theme",
5858
"@eeacms/volto-eea-website-policy"
@@ -155,17 +155,17 @@
155155
"node": "^12 || ^14 || ^16"
156156
},
157157
"dependencies": {
158-
"@eeacms/volto-blockquote": "1.2.0",
159-
"@eeacms/volto-eea-design-system": "0.2.2",
160-
"@eeacms/volto-eea-kitkat": "5.4.0",
158+
"@eeacms/volto-description-block": "0.2.0",
159+
"@eeacms/volto-eea-design-system": "0.3.1",
160+
"@eeacms/volto-eea-kitkat": "6.0.0",
161161
"@eeacms/volto-eea-website-policy": "0.2.1",
162-
"@eeacms/volto-eea-website-theme": "0.5.3",
163-
"@eeacms/volto-progress-block": "0.2.1",
162+
"@eeacms/volto-eea-website-theme": "0.6.0",
163+
"@eeacms/volto-quote-block": "0.2.0",
164164
"@eeacms/volto-slate-label": "0.2.2",
165165
"@eeacms/volto-statistic-block": "0.1.1",
166-
"@eeacms/volto-tags-block": "0.2.0",
166+
"@eeacms/volto-tags-block": "0.2.2",
167167
"@eeacms/volto-timeline-block": "0.2.1",
168-
"@plone/volto": "15.4.1"
168+
"@plone/volto": "15.11.0"
169169
},
170170
"devDependencies": {
171171
"@storybook/addon-actions": "^6.3.0",

0 commit comments

Comments
 (0)