Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5c87f49
fix: change image component in ctablock
mamico Oct 29, 2023
a3931be
ci: upgrade volto
mamico Oct 29, 2023
2bb1c3c
fix: change image component in hlcontent
mamico Oct 29, 2023
668d98e
fix: change image component listingimage
mamico Oct 30, 2023
4cabb5d
Merge branch 'main' into upgrade_volto_17.3_v3
mamico Oct 31, 2023
a5cca39
fix: change image component subevents
mamico Oct 31, 2023
2036e02
fix: change image component gallery
mamico Oct 31, 2023
fa0b26c
fix: change image component GenericCard
mamico Oct 31, 2023
681cc4c
fix: change image component
mamico Nov 1, 2023
ad2b0f1
fix: change image component (sponsor + venuesmall)
mamico Nov 1, 2023
ce3313f
fix: change image component
mamico Nov 2, 2023
b78f0b8
fix: minutes with 00 format
mamico Nov 3, 2023
2c3fcf8
Merge branch 'main' into upgrade_volto_17.3_v3
mamico Nov 6, 2023
6c5e36b
docs: rimosso commento obsoleto
mamico Nov 6, 2023
92bae0a
fix: review giulia
mamico Nov 8, 2023
bd79a3b
fix: review giulia
mamico Nov 8, 2023
3d6af71
Merge branch 'main' into upgrade_volto_17.3_v3
giuliaghisini Nov 9, 2023
a56f0dd
fix: scroll position on h2 .visually-hidden
giuliaghisini Nov 9, 2023
c1cd7aa
Merge branches 'fix_scroll_on_h2_visually_hidden_us_48174' and 'upgra…
giuliaghisini Nov 9, 2023
4c1053f
Merge branch 'main' into upgrade_volto_17.3_v3
giuliaghisini Nov 9, 2023
7623503
Merge branch 'main' into upgrade_volto_17.3_v3
giuliaghisini Nov 13, 2023
db24fdb
feat: upgrade to volto 17.5.0
pnicolli Nov 14, 2023
db12d09
docs: fix order
mamico Nov 14, 2023
e47a156
fix: review piero
giuliaghisini Nov 14, 2023
bc25b26
fix: sponsor evento without image
giuliaghisini Nov 14, 2023
ef86a15
fix: gallery preview
giuliaghisini Nov 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
build-args: |
ADDON_NAME=design-comuni-plone-theme
ADDON_PATH=design-comuni-plone-theme
VOLTO_VERSION=17.0.0-alpha.19
VOLTO_VERSION=17.5.0

- name: Deploy to rancher
uses: redturtle/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ jobs:
build-args: |
ADDON_NAME=design-comuni-plone-theme
ADDON_PATH=design-comuni-plone-theme
VOLTO_VERSION=17.0.0-alpha.19
VOLTO_VERSION=17.5.0
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ jobs:
build-args: |
ADDON_NAME=design-comuni-plone-theme
ADDON_PATH=design-comuni-plone-theme
VOLTO_VERSION=17.0.0-alpha.19
VOLTO_VERSION=17.5.0
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CURRENT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
# ADDON ?= "design-comuni-plone-theme"

PLONE_VERSION=6
VOLTO_VERSION=17.0.0-alpha.19
VOLTO_VERSION=17.5.0

ADDON_NAME='design-comuni-plone-theme'
ADDON_PATH='design-comuni-plone-theme'
Expand Down
4 changes: 0 additions & 4 deletions jest-addon.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ module.exports = {
],
moduleNameMapper: {
'\\.(css|less|scss|sass|svg)$': 'identity-obj-proxy',
'@plone/volto/components/theme/Image/Image':
'<rootDir>/src/addons/design-comuni-plone-theme/src/components/Image/Image.jsx',
'@plone/volto/helpers/Image/Image':
'<rootDir>/src/addons/design-comuni-plone-theme/src/components/Image/helpers.js',
'@plone/volto/cypress': '<rootDir>/node_modules/@plone/volto/cypress',
'@plone/volto/babel': '<rootDir>/node_modules/@plone/volto/babel',
'@plone/volto/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
"stylelint-prettier": "4.0.0"
},
"peerDependencies": {
"@plone/volto": "17.0.0-alpha.19"
"@plone/volto": "17.5.0"
},
"packageManager": "[email protected]"
}
17 changes: 0 additions & 17 deletions razzle.extend.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,23 +108,6 @@ const modify = (webpackConfig, { target, dev }, webpackObject) => {
const babelLoader = webpackConfig.module.rules.find(babelLoaderFinder);
babelLoader.include.push(/node_modules\/design-react-kit/);

webpackConfig.resolve.alias = {
// TODO remove the next two when implemented in core
'@plone/volto/components/theme/Image/Image': `${__dirname}/src/components/Image/Image.jsx`,
'@plone/volto/helpers/Image/Image': `${__dirname}/src/components/Image/helpers.js`,
...webpackConfig.resolve.alias,
// 'design-comuni-plone-theme': `${__dirname}/src`,
};

// remove unused languages. (TODO: move to ENV at build time)
// webpackConfig.plugins.push(
// new webpackObject.ContextReplacementPlugin(
// /moment[/\\]locale$/,
// /(it|it-it|en-us|en-gb)$/,
// ),
// // Ignore all locale files of moment.js - new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
// );

return webpackConfig;
};

Expand Down
165 changes: 0 additions & 165 deletions src/components/Image/Image.jsx

This file was deleted.

Loading