Skip to content

Commit

Permalink
Merge pull request #181 from eea/develop
Browse files Browse the repository at this point in the history
Update Twitter logo in Share to section.
  • Loading branch information
avoinea authored Dec 5, 2023
2 parents dc41ab1 + bf27072 commit a841d5c
Show file tree
Hide file tree
Showing 9 changed files with 103 additions and 19 deletions.
25 changes: 9 additions & 16 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ 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.24.3](https://github.com/eea/volto-eea-website-theme/compare/1.24.2...1.24.3) - 5 December 2023

#### :rocket: New Features

- feat: modify the password reset page - refs #259024 [ana-oprea - [`966e441`](https://github.com/eea/volto-eea-website-theme/commit/966e44163b43f8d41535617f0bb491210465751e)]

#### :hammer_and_wrench: Others

- Update Twitter logo in Share to section. [Ghiță Bizău - [`b9c7426`](https://github.com/eea/volto-eea-website-theme/commit/b9c7426cc29cf1a981603219cec9c780cd43973b)]
### [1.24.2](https://github.com/eea/volto-eea-website-theme/compare/1.24.1...1.24.2) - 4 December 2023

#### :bug: Bug Fixes
Expand Down Expand Up @@ -40,11 +49,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- test: Add real image to cypress test [Alin Voinea - [`4ff591a`](https://github.com/eea/volto-eea-website-theme/commit/4ff591ae3318c9588b4e2114582c0fa6cfdf31ae)]
- test: Add cypress tests for Image block styling position and align [Alin Voinea - [`7341ef7`](https://github.com/eea/volto-eea-website-theme/commit/7341ef7b92714fc0cc3ab0c31c39033e7b3e19e7)]
- Revert "change(tests): commented out rss test since title block config is missing" [Alin Voinea - [`fb61191`](https://github.com/eea/volto-eea-website-theme/commit/fb611918d6ca380b89b594f283dcf9f685a4b294)]
- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`6a3be30`](https://github.com/eea/volto-eea-website-theme/commit/6a3be3092589411af7808a235f76de5222fd3868)]
- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`c3978f2`](https://github.com/eea/volto-eea-website-theme/commit/c3978f23375ef066e9fd6f6c2e34ba6c1c058f69)]
- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`f672779`](https://github.com/eea/volto-eea-website-theme/commit/f672779e845bec9240ccc901e9f53ec80c5a1819)]
- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`ae5d8e3`](https://github.com/eea/volto-eea-website-theme/commit/ae5d8e3f4e04dc2808d47ce2ee886e1b23b528da)]
- test: [JENKINS] Improve cypress time [valentinab25 - [`170ff0c`](https://github.com/eea/volto-eea-website-theme/commit/170ff0c8e3b30e69479bdf1117e811fea94f1027)]
### [1.23.0](https://github.com/eea/volto-eea-website-theme/compare/1.22.1...1.23.0) - 2 November 2023

#### :rocket: New Features
Expand All @@ -57,7 +61,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :house: Internal changes

- chore: [JENKINS] Refactor automated testing [valentinab25 - [`f28fce3`](https://github.com/eea/volto-eea-website-theme/commit/f28fce3d1eb815f95fb9aa40de42b10b7e8e30c5)]
- chore: husky, lint-staged use fixed versions [valentinab25 - [`6d15088`](https://github.com/eea/volto-eea-website-theme/commit/6d150886c5aeb2ca0b569270486e60f7cc274e2c)]
- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`20c0323`](https://github.com/eea/volto-eea-website-theme/commit/20c032380b33c0077c869a05136f93e2fb68e5d4)]

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

#### :house: Internal changes

- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`370dcbf`](https://github.com/eea/volto-eea-website-theme/commit/370dcbfbf1a8135ce7b1b3b271b004552a631837)]

#### :hammer_and_wrench: Others

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

#### :hammer_and_wrench: Others

- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`6c5e2f8`](https://github.com/eea/volto-eea-website-theme/commit/6c5e2f80456e2061d9e9c15fd0a0b91b9ac70568)]
### [1.9.1](https://github.com/eea/volto-eea-website-theme/compare/1.9.0...1.9.1) - 28 February 2023

#### :bug: Bug Fixes
Expand Down Expand Up @@ -546,7 +547,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

- For some reasons types is a string [Alin Voinea - [`3769a09`](https://github.com/eea/volto-eea-website-theme/commit/3769a0981181d5b633f3498daebbe96be8b4b833)]
- Fix(redirect): o.filter - refs #157627 [Alin Voinea - [`deb23da`](https://github.com/eea/volto-eea-website-theme/commit/deb23da846444cc96539697fd798429ae0abe89e)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`f1fffc5`](https://github.com/eea/volto-eea-website-theme/commit/f1fffc5db96725440863d545580b4e76cce4b796)]
### [1.5.0](https://github.com/eea/volto-eea-website-theme/compare/1.4.2...1.5.0) - 9 January 2023

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

- Release 1.4.0 [Alin Voinea - [`bd42a0d`](https://github.com/eea/volto-eea-website-theme/commit/bd42a0d26e928cac5d99933194755da3db06b341)]
- bump version to use as volto-eea-design-system [David Ichim - [`f4be047`](https://github.com/eea/volto-eea-website-theme/commit/f4be047328b46399b03b612d378b18aaf82e7dc1)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`9b7cfef`](https://github.com/eea/volto-eea-website-theme/commit/9b7cfefb4d34fc1c948015e491feb370f9795bd8)]
- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`df252a9`](https://github.com/eea/volto-eea-website-theme/commit/df252a9bfed0bb86cadf53c59dd1603b1e2cd822)]
### [1.3.2](https://github.com/eea/volto-eea-website-theme/compare/1.3.1...1.3.2) - 16 December 2022

Expand All @@ -590,7 +589,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`a43c658`](https://github.com/eea/volto-eea-website-theme/commit/a43c658a7920c8df95e763b9a637f38ce77eba2c)]
- Better razzle.config [Tiberiu Ichim - [`81dbf48`](https://github.com/eea/volto-eea-website-theme/commit/81dbf48815fb27facb4f82c9b764540fdf188b2e)]
- Better razzle.config [Tiberiu Ichim - [`7bc9da2`](https://github.com/eea/volto-eea-website-theme/commit/7bc9da2cd837ab62a95cd29979cdd9b0055b7d67)]
### [1.3.1](https://github.com/eea/volto-eea-website-theme/compare/1.3.0...1.3.1) - 28 November 2022
Expand All @@ -601,7 +599,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- yarn 3 [Alin Voinea - [`ea7a709`](https://github.com/eea/volto-eea-website-theme/commit/ea7a7094945312776e9b6f44e371178603e92139)]
### [1.3.0](https://github.com/eea/volto-eea-website-theme/compare/1.2.0...1.3.0) - 22 November 2022

#### :rocket: New Features
Expand Down Expand Up @@ -642,7 +639,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Add subsite class to body [Tiberiu Ichim - [`74d700f`](https://github.com/eea/volto-eea-website-theme/commit/74d700fbfd6249a8604762a7e4e49cce857db0f3)]
- Add subsite info to header [Tiberiu Ichim - [`47daf8b`](https://github.com/eea/volto-eea-website-theme/commit/47daf8bb6374a1222040626b19d4154df7ba1b83)]
- fix eslint [Miu Razvan - [`eb8d0a7`](https://github.com/eea/volto-eea-website-theme/commit/eb8d0a790bc70c0aae256c6ff35f63c4885f338e)]
- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`cc578a4`](https://github.com/eea/volto-eea-website-theme/commit/cc578a413b205a8e61e091fab3a88f94cedefc89)]
### [1.1.0](https://github.com/eea/volto-eea-website-theme/compare/1.0.0...1.1.0) - 28 October 2022

#### :nail_care: Enhancements
Expand Down Expand Up @@ -690,7 +686,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`33b56ac`](https://github.com/eea/volto-eea-website-theme/commit/33b56acb13fbaf0c5b79e8fc6e13c4b699c79c90)]
### [0.7.3](https://github.com/eea/volto-eea-website-theme/compare/0.7.2...0.7.3) - 22 September 2022

#### :hammer_and_wrench: Others
Expand Down Expand Up @@ -958,7 +953,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Header refactor, add custom logo #5 [ichim-david - [`4950235`](https://github.com/eea/volto-eea-website-theme/commit/49502358105437cfeac3b144e6d301cb59aa2346)]
- Update footer.config with new publication card component [ichim-david - [`2e38e9a`](https://github.com/eea/volto-eea-website-theme/commit/2e38e9a417f835009d60c80d4eb4b30229f55e45)]
- feature(breadcrumbs): implement eea-design-system breadcrumb as Volto component #32 #7 [ichim-david - [`181af41`](https://github.com/eea/volto-eea-website-theme/commit/181af4125ce2b9ddac56dab4723cb11c26633221)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`da8ceb6`](https://github.com/eea/volto-eea-website-theme/commit/da8ceb68ea68bfbc9504e48ccd4d68277f11ab9a)]
- use breadcrumbs from eea-design-system [nileshgulia1 - [`db2f9e9`](https://github.com/eea/volto-eea-website-theme/commit/db2f9e9a4327420a3cce9a9903cd88549b129eab)]
- Update theme.config [ichim-david - [`8eca4f4`](https://github.com/eea/volto-eea-website-theme/commit/8eca4f40397a4aeca6d39029c92db78968d37064)]
- Added keyContent component to theme.config [ichim-david - [`d86f202`](https://github.com/eea/volto-eea-website-theme/commit/d86f202d0274d839487a88b51cae9a0e899beb23)]
Expand Down Expand Up @@ -1000,5 +994,4 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- yarn bootstrap [Alin Voinea - [`6995e9e`](https://github.com/eea/volto-eea-website-theme/commit/6995e9e091f21fdbbdffa8a44fc0e2c626f6d46a)]
- Initial commit [Alin Voinea - [`6a9c03a`](https://github.com/eea/volto-eea-website-theme/commit/6a9c03a7cebe71ca87e82cf58c42904063e9d8d3)]
10 changes: 10 additions & 0 deletions locales/de/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ msgstr ""
msgid "European Environment Agency"
msgstr ""

#: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
# defaultMessage: Invalid block - Will be removed on saving
msgid "Invalid Block"
msgstr ""

#: components/theme/Banner/View
# defaultMessage: Modified
msgid "Modified"
Expand Down Expand Up @@ -56,6 +61,11 @@ msgstr ""
msgid "Type the title…"
msgstr ""

#: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
# defaultMessage: Unknown Block {block}
msgid "Unknown Block"
msgstr ""

#: components/theme/Banner/View
# defaultMessage: RSS Feed
msgid "rssFeed"
Expand Down
10 changes: 10 additions & 0 deletions locales/en/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ msgstr ""
msgid "European Environment Agency"
msgstr ""

#: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
# defaultMessage: Invalid block - Will be removed on saving
msgid "Invalid Block"
msgstr ""

#: components/theme/Banner/View
# defaultMessage: Modified
msgid "Modified"
Expand Down Expand Up @@ -56,6 +61,11 @@ msgstr ""
msgid "Type the title…"
msgstr ""

#: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
# defaultMessage: Unknown Block {block}
msgid "Unknown Block"
msgstr ""

#: components/theme/Banner/View
# defaultMessage: RSS Feed
msgid "rssFeed"
Expand Down
10 changes: 10 additions & 0 deletions locales/it/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ msgstr ""
msgid "European Environment Agency"
msgstr ""

#: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
# defaultMessage: Invalid block - Will be removed on saving
msgid "Invalid Block"
msgstr ""

#: components/theme/Banner/View
# defaultMessage: Modified
msgid "Modified"
Expand Down Expand Up @@ -56,6 +61,11 @@ msgstr ""
msgid "Type the title…"
msgstr ""

#: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
# defaultMessage: Unknown Block {block}
msgid "Unknown Block"
msgstr ""

#: components/theme/Banner/View
# defaultMessage: RSS Feed
msgid "rssFeed"
Expand Down
10 changes: 10 additions & 0 deletions locales/ro/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ msgstr ""
msgid "European Environment Agency"
msgstr ""

#: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
# defaultMessage: Invalid block - Will be removed on saving
msgid "Invalid Block"
msgstr ""

#: components/theme/Banner/View
# defaultMessage: Modified
msgid "Modified"
Expand Down Expand Up @@ -56,6 +61,11 @@ msgstr ""
msgid "Type the title…"
msgstr ""

#: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
# defaultMessage: Unknown Block {block}
msgid "Unknown Block"
msgstr ""

#: components/theme/Banner/View
# defaultMessage: RSS Feed
msgid "rssFeed"
Expand Down
12 changes: 11 additions & 1 deletion locales/volto.pot
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Plone\n"
"POT-Creation-Date: 2023-08-29T17:13:27.797Z\n"
"POT-Creation-Date: 2023-12-05T09:30:23.741Z\n"
"Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
"Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
Expand All @@ -28,6 +28,11 @@ msgstr ""
msgid "European Environment Agency"
msgstr ""

#: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
# defaultMessage: Invalid block - Will be removed on saving
msgid "Invalid Block"
msgstr ""

#: components/theme/Banner/View
# defaultMessage: Modified
msgid "Modified"
Expand Down Expand Up @@ -58,6 +63,11 @@ msgstr ""
msgid "Type the title…"
msgstr ""

#: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
# defaultMessage: Unknown Block {block}
msgid "Unknown Block"
msgstr ""

#: components/theme/Banner/View
# defaultMessage: RSS Feed
msgid "rssFeed"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eeacms/volto-eea-website-theme",
"version": "1.24.2",
"version": "1.24.3",
"description": "@eeacms/volto-eea-website-theme: Volto add-on",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
Expand Down
2 changes: 1 addition & 1 deletion src/components/theme/Banner/View.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ const View = (props) => {
}}
/>
<Banner.Action
icon="ri-twitter-fill"
icon="ri-twitter-x-line"
title={'Share page to Twitter'}
titleClass={'hiddenStructure'}
onClick={() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import React from 'react';
import { Container } from 'semantic-ui-react';
import { FormattedMessage } from 'react-intl';

function RequestPasswordReset() {
return (
<Container id="passwordreset">
<h1 className="documentFirstHeading">
<FormattedMessage id="Lost Password" defaultMessage="Lost Password" />
</h1>
<p className="documentDescription">
<div>
<FormattedMessage
id="For security reasons, we store your password encrypted, and cannot mail it to you. If you would like to reset your password, fill out the form below and we will send you an email at the address you gave when you registered to start the process of resetting your password."
defaultMessage="For security reasons, we store your password encrypted, and cannot mail it to you. If you would like to reset your password, fill out the form below and we will send you an email at the address you gave when you registered to start the process of resetting your password."
/>
</div>
</p>
<div className="documentContent">
<p>
<FormattedMessage
id="To reset your password visit {link}."
defaultMessage="To reset your password visit {link}."
values={{
link: (
<a href="https://www.eionet.europa.eu/password-reset">
<FormattedMessage
id="Reset Eionet account password page"
defaultMessage="Reset Eionet account password page"
/>
</a>
),
}}
/>
</p>
</div>
</Container>
);
}

export default RequestPasswordReset;

0 comments on commit a841d5c

Please sign in to comment.