Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgradetolatest plone and Volto #331

Merged
merged 7 commits into from
Jan 26, 2024
+14 −13
Merged

Upgradetolatest plone and Volto #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
92ff010
Upgrade to Volto 17.11.1 and Plone 6.0.9
sneridagh Jan 17, 2024
efe2988
Changelog
sneridagh Jan 17, 2024
965a905
lock
sneridagh Jan 17, 2024
7b07160
Upgrade to 17.11.2
sneridagh Jan 17, 2024
725d4c8
Merge branch 'main' into upgradetolatestPloneVolot
sneridagh Jan 26, 2024
dec5112
Update to 17.11.5
sneridagh Jan 26, 2024
bcd2217
Changelog
sneridagh Jan 26, 2024
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/acceptance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]
env:
ADDON_NAME: "@kitconcept/volto-light-theme"
ADDON_PATH: "volto-light-theme"
VOLTO_VERSION: "17.11.2"
VOLTO_VERSION: "17.11.5"

jobs:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
env:
ENVIRONMENT: "light-theme.kitconcept.io"
IMAGE_NAME: "ghcr.io/kitconcept/voltolighttheme-frontend"
VOLTO_VERSION: "17.11.2"
VOLTO_VERSION: "17.11.5"

jobs:
meta:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RESET=`tput sgr0`
YELLOW=`tput setaf 3`

PLONE_VERSION=6.0.9
VOLTO_VERSION=17.11.2
VOLTO_VERSION=17.11.5

ADDON_NAME='@kitconcept/volto-light-theme'
ADDON_PATH='volto-light-theme'
Expand Down
1 change: 1 addition & 0 deletions news/331.internal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade to Votlo 17.11.5 and Plone 6.0.9 @sneridagh
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"devDependencies": {
"@babel/eslint-parser": "7.22.15",
"@plone/scripts": "^3.0.0",
"@plone/scripts": "^3.3.2",
"eslint": "8.49.0",
"eslint-config-prettier": "9.0.0",
"eslint-config-react-app": "7.0.1",
Expand Down Expand Up @@ -72,6 +72,6 @@
"@kitconcept/volto-introduction-block": "^1.0.0",
"@kitconcept/volto-separator-block": "^4.0.0",
"@kitconcept/volto-slider-block": "^6.1.0",
"@plone/volto": "^17.11.2"
"@plone/volto": "^17.11.5"
}
}
16 changes: 8 additions & 8 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1824,7 +1824,7 @@ __metadata:
resolution: "@kitconcept/volto-light-theme@workspace:."
dependencies:
"@babel/eslint-parser": 7.22.15
"@plone/scripts": ^3.0.0
"@plone/scripts": ^3.3.2
eslint: 8.49.0
eslint-config-prettier: 9.0.0
eslint-config-react-app: 7.0.1
Expand Down Expand Up @@ -1852,7 +1852,7 @@ __metadata:
"@kitconcept/volto-introduction-block": ^1.0.0
"@kitconcept/volto-separator-block": ^4.0.0
"@kitconcept/volto-slider-block": ^6.1.0
"@plone/volto": ^17.11.2
"@plone/volto": ^17.11.5
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -2105,9 +2105,9 @@ __metadata:
languageName: node
linkType: hard

"@plone/scripts@npm:^3.0.0":
version: 3.1.0
resolution: "@plone/scripts@npm:3.1.0"
"@plone/scripts@npm:^3.3.2":
version: 3.3.2
resolution: "@plone/scripts@npm:3.3.2"
dependencies:
"@babel/core": ^7.0.0
babel-plugin-react-intl: 5.1.17
Expand All @@ -2119,13 +2119,13 @@ __metadata:
git-url-parse: ^13.1.0
glob: 7.1.6
lodash: 4.17.21
mrs-developer: "*"
mrs-developer: ^2.1.1
pofile: 1.0.10
bin:
addon: addon/index.js
changelogupdater: changelogupdater.cjs
i18n: i18n.cjs
checksum: 5c12da74fad98f65526685f5cb7818392b97007345e9225d33db1663be4c680d54a705be355309922f8a7485d7f0f15ffd7aa2c2cc202031ce4a6c1320be6feb
checksum: 7dc67a582e4a9b48fd51564ceccc3ce7f57c6b9355c56ebf915e32add6ac3b216e796f2ae4dc5f0c2dca53a815e05c79e2b7dabc02f6e0b9df7ea03e347b9763
languageName: node
linkType: hard

Expand Down Expand Up @@ -6615,7 +6615,7 @@ __metadata:
languageName: node
linkType: hard

"mrs-developer@npm:*":
"mrs-developer@npm:^2.1.1":
version: 2.1.1
resolution: "mrs-developer@npm:2.1.1"
dependencies:
Expand Down
Loading