Skip to content

Commit

Permalink
Merge branch 'plone:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
boss6825 authored Feb 18, 2025
2 parents 86d9778 + 3b46e82 commit f41945b
Show file tree
Hide file tree
Showing 21 changed files with 95 additions and 16 deletions.
10 changes: 10 additions & 0 deletions docs/source/_inc/_install-browser-reqs-volto.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
You can view the list of supported browsers for Volto at [Browserslist](https://browsersl.ist/#q=%3E1%25%0Alast+4+versions%0AFirefox+ESR%0Anot+dead).

These browsers are set according to the `browserslist` key in Volto's [`package.json`](https://github.com/plone/volto/blob/1aff8d0451f5cb375ca9f5afe9b2b72a0555afd8/packages/volto/package.json#L170-L176) file, whose content is below.

```shell
>1%
last 4 versions
Firefox ESR
not dead
```
6 changes: 6 additions & 0 deletions docs/source/_static/link.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/source/blocks/block-style-wrapper.md
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ Finally, assuming that you select the default value for the {guilabel}`Aspect Ra
As you can see, the custom CSS declaration applies only in the `div` where you inject the property.

```{seealso}
[CSS custom properties basics](https://developer.mozilla.org/en-US/docs/Web/CSS/Using_CSS_custom_properties)
[CSS custom properties basics](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_cascading_variables/Using_CSS_custom_properties)
```

If you want to use it in your custom components, you need to apply it in the root of your block's view component as follows:
Expand Down
2 changes: 1 addition & 1 deletion docs/source/contributing/version-policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ We recommend using the current LTS version.

## Supported web browsers

```{include} ../../_inc/_install-browser-reqs-volto.md
```{include} ../_inc/_install-browser-reqs-volto.md
```


Expand Down
22 changes: 22 additions & 0 deletions docs/source/release-notes/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,28 @@ myst:

<!-- towncrier release notes start -->

## 18.9.0 (2025-02-17)

### Feature

- Add self link in alternate language links @erral [#6602](https://github.com/plone/volto/issues/6602)

### Bugfix

- Serve `sitemap.xml.gz` as an alias for `sitemap-index.xml`. @reebalazs [#6561](https://github.com/plone/volto/issues/6561)
- Move the block chooser beneath the block, instead of covering the block and preventing making a choice, when `config.experimental.addBlockButton` is enabled. @giuliaghisini [#6751](https://github.com/plone/volto/issues/6751)

### Internal

- Use Plone 6.1.0 final release. @sneridagh [#6731](https://github.com/plone/volto/issues/6731)
- Add Film Basque Country website to README. @erral [#6741](https://github.com/plone/volto/issues/6741)
- Sync content from Awesome Volto into README. @stevepiercy [#6745](https://github.com/plone/volto/issues/6745)
- Fixes intermittent error in cypress "Index Text Block" test. @wesleybl [#6755](https://github.com/plone/volto/issues/6755)

### Documentation

- Document Slate heading as anchor links in Volto blocks user manual. @nileshgulia1 [#5755](https://github.com/plone/volto/issues/5755)

## 18.8.2 (2025-02-08)

### Bugfix
Expand Down
14 changes: 14 additions & 0 deletions docs/source/user-manual/blocks.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,20 @@ Almost all blocks have some configuration options.
To rearrange blocks, to the right of the block you want to move, click on its drag handle, move the block where you want it in the page, and release the drag handle.


(copy-anchor-links-label)=

### Copy headings as anchor links

When you move your mouse over a heading, a link icon <img alt="Link icon" src="../_static/link.svg" class="inline"> appears on the right side.
Click this icon to copy a direct link to that specific heading on the page onto your clipboard.

Now you can paste the copied link to share a specific section of a page with others.

```{note}
This feature is enabled by default, and only authenticated users can use this feature.
```


(delete-a-block-label)=

### Delete a block
Expand Down
22 changes: 22 additions & 0 deletions packages/volto/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,28 @@ myst:

<!-- towncrier release notes start -->

## 18.9.0 (2025-02-17)

### Feature

- Add self link in alternate language links @erral [#6602](https://github.com/plone/volto/issues/6602)

### Bugfix

- Serve `sitemap.xml.gz` as an alias for `sitemap-index.xml`. @reebalazs [#6561](https://github.com/plone/volto/issues/6561)
- Move the block chooser beneath the block, instead of covering the block and preventing making a choice, when `config.experimental.addBlockButton` is enabled. @giuliaghisini [#6751](https://github.com/plone/volto/issues/6751)

### Internal

- Use Plone 6.1.0 final release. @sneridagh [#6731](https://github.com/plone/volto/issues/6731)
- Add Film Basque Country website to README. @erral [#6741](https://github.com/plone/volto/issues/6741)
- Sync content from Awesome Volto into README. @stevepiercy [#6745](https://github.com/plone/volto/issues/6745)
- Fixes intermittent error in cypress "Index Text Block" test. @wesleybl [#6755](https://github.com/plone/volto/issues/6755)

### Documentation

- Document Slate heading as anchor links in Volto blocks user manual. @nileshgulia1 [#5755](https://github.com/plone/volto/issues/5755)

## 18.8.2 (2025-02-08)

### Bugfix
Expand Down
8 changes: 5 additions & 3 deletions packages/volto/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,17 @@ To ensure your website gets the greatest exposure, add it both to [Awesome Volto
- [Debako Udala / Ayuntamiento de Deba](https://www.deba.eus/eu) (Website of the municipality of Deba, developed by [CodeSyntax](https://www.codesyntax.com/en), 2022)
- [European Environment Agency](https://www.eea.europa.eu/en) (Website of the European Environment Agency. Developed by [Eau de Web](https://eaudeweb.ro), 2023)
- [Energy Climate Union portal for Europe](https://climate-energy.eea.europa.eu/) (Thematic website focusing on European strides towards mitigating climate change, developed by [Eau de Web](https://eaudeweb.ro/), 2020)
- [Excellence at Humboldt-Universität zu Berlin](https://www.alles-beginnt-mit-einer-frage.de) (Website for the excellence initiative of the [Humboldt University Berlin](https://www.hu-berlin.de/de), developed by [kitconcept GmbH](https://kitconcept.com/en), 2019)
- Excellence at Humboldt-Universität zu Berlin (Website for the excellence initiative of the [Humboldt University Berlin](https://www.hu-berlin.de/de), developed by [kitconcept GmbH](https://kitconcept.com/en), 2019)
- [Film Basque Country](https://www.filmbasquecountry.eus/en) (Website to attract, guide, and support international productions, making it easier for them to film in the Basque Country, developed by [CodeSyntax](https://www.codesyntax.com/en), 2025)
- [Forest Information System for Europe](https://forest.eea.europa.eu) (Thematic website focusing on European forests, developed by [Eau de Web](https://eaudeweb.ro/), 2019)
- [Forschungszentrum Jülich](https://www.fz-juelich.de/de) (Website for Forschungzentrum Jülich, which is one of the largest research institutions in Europe, developed by [kitconcept GmbH](https://kitconcept.com/en), 2022)
- [Geosphere Austria](https://www.geosphere.at/de) (Website of the Austrian Federal Institute, national geological, geophysical, climatological and meteorological service, 2023)
- [German Aerospace Center (DLR)](https://www.dlr.de/de) (The German Aerospace Center (DLR) is the Federal Republic of Germany's research center for aeronautics. With more than 10.000 employees and a yearly budget of more than 1 billion euros, it is one of the largest research institutions in Germany, developed by [kitconcept GmbH](https://kitconcept.com/en), 2023)
- [Helmholtz-Institut Erlangen-Nürnberg für Erneuerbare Energien (HI-ERN)](https://www.hi-ern.de/de) (Website for HI ERN, a research institution for renewable energies, developed by [kitconcept GmbH](https://kitconcept.com/en), 2022)
- [Humboldt Labor](https://www.humboldtforum.org/de/programm/dauerangebot/ausstellung/nach-der-natur-14144/) (The Humboldt Lab is a website where the Humboldt University Berlin presents its latest research projects and findings. Developed by [WLDX](https://wldx.de/) and [kitconcept GmbH](https://kitconcept.com/en), 2020)
- [ILPO](https://ilpo.jyu.fi/) (the registration portal of continuous learning at the University of Jyväskylä. Developed by University of Jyväskylä, 2022)
- [Industrial Emissions portal for Europe](https://industry.eea.europa.eu) (Thematic website focusing on European industrial emissions, developed by [Eau de Web](https://eaudeweb.ro/), 2020)
- [iTlent - Basque Institute of Talent in VET](https://www.itlent.eus/en) (developed by [CodeSyntax](https://www.codesyntax.com/en), 2024)
- [Jobfamilie MEDICE](https://jobfamilie.medice.de/de) (Carrer website for MEDICE Arzneimittel Pütter GmbH & Co. KG), developed by [Werkbank GmbH](https://werkbank.de/), 2020)
- [Lanku](https://www.lanku.eus) (Website for Lanku Kultur Zerbitzuak, a company offering cultural services and improvised Basque verse singing sessions across the Basque Country, developed by [CodeSyntax](https://www.codesyntax.com/en), 2023)
- [Leibniz Institute for Science and Mathematics Education (IPN)](https://www.leibniz-ipn.de/de) (Website of the IPN, a research institute dedicated to issues related to learning and teaching of science, mathematics and computer science in and outside of schools, developed by [Starzel](https://www.starzel.de), 2023)
Expand Down Expand Up @@ -179,7 +182,7 @@ You should check the dependencies in their `package.json` for more details.
- [Freshwater Information System for Europe](https://github.com/eea/freshwater-frontend) - Volto project for [Freshwater Information System for Europe website](https://water.europa.eu/freshwater)
- [European Industrial Emissions Portal](https://github.com/eea/industry-frontend ) - Volto project for [European Industrial Emissions Portal website](https://industry.eea.europa.eu)
- [Biodiversity Information System for Europe](https://github.com/eea/bise-frontend) - Volto project for [Biodiversity Information System for Europe website](https://biodiversity.europa.eu)
- [EEA Main Website frontend](https://github.com/eea/eea-website-frontend) - Volto project for [European Environment Agency](https://www.eea.europa.eu/en)
- [EEA Main Website frontend](https://github.com/eea/eea-website-frontend) - Plone 6 Volto frontend for [European Environment Agency](https://www.eea.europa.eu/en)
- [Climate and energy in the EU](https://github.com/eea/climate-energy-frontend) - Volto project for [Climate and energy in the EU website](https://climate-energy.eea.europa.eu)
- [volto-bise](https://github.com/eea/volto-bise) - A Volto project packaged as an addon. It provides Theming using a razzle.extend.js provided alias.
- [design-volto-theme](https://github.com/RedTurtle/design-volto-theme) Volto theme for Italian Public Administration
Expand All @@ -190,7 +193,6 @@ You should check the dependencies in their `package.json` for more details.
- [nsw-design-system-plone6-kit](https://github.com/pretagov/nsw-design-system-plone6-kit) - NSW Design System Plone 6 Kit Volto project for [NSW.gov.au sites](https://digitalnsw.pretagov.com.au/)
- [volto-centraalmuseum-theme](https://github.com/intk/volto-centraalmuseum-theme) - Volto project for the [Centraal Museum & Rietveld](https://www.centraalmuseum.nl/nl) made for [INTK](https://www.intk.com/en).
- [volto-eea-design-system](https://github.com/eea/volto-eea-design-system) - EEA Design System Plone 6 Kit Volto project for [European Environment Agency web sites](https://eea.github.io/volto-eea-design-system/)
- [volto-eea-website-theme](https://github.com/eea/volto-eea-website-theme) - EEA Plone 6 Volto Theme for [European Environment Agency web sites](https://www.eea.europa.eu/en)
- [volto-eea-kitkat](https://github.com/eea/volto-eea-kitkat) - A known good set of Volto add-ons to be used within all EEA projects and beyond, made for [European Environment Agency](https://www.eea.europa.eu/en)
- [volto-rietveldschroderhuis-theme](https://github.com/intk/volto-rietveldschroderhuis-theme) - Volto project for the [Rietveld Schröder House](https://www.rietveldschroderhuis.nl/en) made for [INTK](https://www.intk.com/en).
- [volto-zeeuwsmuseum-theme](https://github.com/intk/volto-zeeuwsmuseum-theme) - Volto project for the [Zeeuws Museum](https://www.zeeuwsmuseum.nl/en) made for [INTK](https://www.intk.com/en).
7 changes: 5 additions & 2 deletions packages/volto/cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -730,10 +730,13 @@ Cypress.Commands.add('getSlate', (createNewSlate = false) => {
cy.getIfExists(
SLATE_SELECTOR,
() => {
slate = cy.get(SLATE_SELECTOR).last();
slate = cy.get(SLATE_SELECTOR).last().should('be.visible');
},
() => {
slate = cy.get(SLATE_SELECTOR, { timeout: 10000 }).last();
slate = cy
.get(SLATE_SELECTOR, { timeout: 10000 })
.last()
.should('be.visible');
},
);
return slate;
Expand Down
1 change: 0 additions & 1 deletion packages/volto/news/6561.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion packages/volto/news/6602.feature

This file was deleted.

1 change: 0 additions & 1 deletion packages/volto/news/6731.internal

This file was deleted.

1 change: 0 additions & 1 deletion packages/volto/news/6741.internal

This file was deleted.

1 change: 0 additions & 1 deletion packages/volto/news/6745.internal

This file was deleted.

1 change: 1 addition & 0 deletions packages/volto/news/6759.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix load more comments link. @sneridagh
1 change: 1 addition & 0 deletions packages/volto/news/6760.documentation
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix reference to `link.svg` and include of `_inc/_install-browser-reqs-volto.md`. @stevepiercy
2 changes: 1 addition & 1 deletion packages/volto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
],
"license": "MIT",
"version": "18.8.2",
"version": "18.9.0",
"repository": {
"type": "git",
"url": "[email protected]:plone/volto.git"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ const BlockChooserButton = (props) => {
{
name: 'flip',
options: {
fallbackPlacements: ['right-end', 'top-start'],
fallbackPlacements: config.experimental.addBlockButton.enabled
? ['bottom-start', 'bottom-end']
: ['right-end', 'top-start'],
},
},
],
Expand Down
2 changes: 1 addition & 1 deletion packages/volto/src/components/theme/Comments/Comments.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ const Comments = (props) => {
};

const loadMoreComments = () => {
dispatch(listMoreComments(next));
dispatch(listMoreComments(flattenToAppURL(next)));
};

const onDelete = (value) => {
Expand Down
1 change: 1 addition & 0 deletions packages/volto/types/express-middleware/sitemap.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export default function sitemapMiddleware(): any;
export function sitemap(req: any, res: any, next: any): void;
export function sitemapIndex(req: any, res: any, next: any): void;
export function sitemapIndexCompatibility(req: any, res: any, next: any): void;
2 changes: 1 addition & 1 deletion packages/volto/types/helpers/Sitemap/Sitemap.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const SITEMAP_BATCH_SIZE: 5000;
export function generateSitemap(_req: any, start?: number, size?: any): string;
export function generateSitemapIndex(_req: any): string;
export function generateSitemapIndex(_req: any, gzip?: boolean): string;

0 comments on commit f41945b

Please sign in to comment.