Skip to content

Commit

Permalink
Merge branch 'release/8.11.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
marteinn committed Jun 6, 2023
2 parents 3e72b74 + 53b3e60 commit 41f274d
Show file tree
Hide file tree
Showing 11 changed files with 7,944 additions and 4,779 deletions.
25 changes: 22 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,30 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Added
### Changed
### Fixed
### Removed

## [8.11.0] - 2023-06-06

## Added
## Changed
## Fixed
## Removed
- Make sure slug uses proper widget (@ludwi)
- Upgrade wagtail-meta-preview to 2.0.1
- Upgrade django to 4.2.2
- Upgrade wagtail to 5.0.1
- Upgrade sentry_sdk to 1.25.0
- Upgrade django-stubs to 4.2.1
- Upgrade djangorestframework-stubs to 3.14.1
- Upgrade storybook and related packages to 7.0.18
- Upgrade eslint to 8.42.0
- Upgrade eslint-config-next to 13.4.4
- Upgrade @sentry/nextjs to 7.54.0
- Upgrade next.js to 13.4.4
- Upgrade next-i18next to 13.3.0
- Upgrade css-loader to 6.8.1
- Upgrade @types/react to 18.2.8
- Upgrade @swc/core to 1.3.62

## [8.11.0] - 2023-05-19

Expand Down
6,302 changes: 3,937 additions & 2,365 deletions Company-Project/frontend/package-lock.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions Company-Project/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"test:ci": "npx jest --ci --runInBand --reporters=default --reporters=jest-junit"
},
"dependencies": {
"@sentry/nextjs": "^7.51.1",
"@types/react": "^18.2.6",
"@sentry/nextjs": "^7.54.0",
"@types/react": "^18.2.8",
"classnames": "^2.3.2",
"i18next": "^22.5.0",
"next": "13.4.3",
"next-i18next": "^13.2.2",
"next": "13.4.4",
"next-i18next": "^13.3.0",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "18.2.0",
Expand All @@ -47,22 +47,22 @@
}
},
"devDependencies": {
"@storybook/addon-a11y": "^7.0.12",
"@storybook/addon-actions": "^7.0.12",
"@storybook/addon-backgrounds": "^7.0.12",
"@storybook/addon-viewport": "^7.0.12",
"@storybook/addons": "^7.0.12",
"@storybook/nextjs": "^7.0.12",
"@storybook/react": "^7.0.12",
"@swc/core": "^1.3.59",
"@storybook/addon-a11y": "^7.0.18",
"@storybook/addon-actions": "^7.0.18",
"@storybook/addon-backgrounds": "^7.0.18",
"@storybook/addon-viewport": "^7.0.18",
"@storybook/addons": "^7.0.18",
"@storybook/nextjs": "^7.0.18",
"@storybook/react": "^7.0.18",
"@swc/core": "^1.3.62",
"@swc/jest": "^0.2.26",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
"cross-env": "^7.0.3",
"css-loader": "^6.7.4",
"eslint": "8.40.0",
"eslint-config-next": "13.4.3",
"css-loader": "^6.8.1",
"eslint": "8.42.0",
"eslint-config-next": "13.4.4",
"eslint-config-prettier": "^8.8.0",
"husky": "^8.0.3",
"jest": "^29.5.0",
Expand All @@ -71,7 +71,7 @@
"prettier": "^2.8.8",
"pretty-quick": "^3.1.3",
"react-test-renderer": "^18.2.0",
"storybook": "^7.0.12",
"storybook": "^7.0.18",
"style-loader": "^3.3.3"
}
}
3 changes: 2 additions & 1 deletion Company-Project/src/main/mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
TabbedInterface,
WagtailAdminPageForm,
)
from wagtail.admin.widgets.slug import SlugInput
from wagtail.models import Page
from wagtail.utils.decorators import cached_classmethod
from wagtail_meta_preview.panels import (
Expand Down Expand Up @@ -118,7 +119,7 @@ class SeoMixin(Page):
)

promote_panels = [
FieldPanel("slug"),
FieldPanel("slug", widget=SlugInput),
GoogleFieldPreviewPanel(
[
FieldPanel("seo_title"),
Expand Down
8 changes: 4 additions & 4 deletions Company-Project/src/requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Django==4.2.1
Django==4.2.2
psycopg2==2.9.6
sentry_sdk==1.23.1
sentry_sdk==1.25.0
python-dotenv==1.0.0
wagtail==5.0
wagtail-meta-preview==2.0.0
wagtail==5.0.1
wagtail-meta-preview==2.0.1
wagtail_headless_preview==0.5.0
4 changes: 2 additions & 2 deletions Company-Project/src/requirements/local.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# Add local extra requirements here (django-debug etc)
black
django-debug-toolbar
django-stubs==1.15.0
djangorestframework-stubs==3.14.0
django-stubs==4.2.1
djangorestframework-stubs==3.14.1
isort
pipdeptree
ptvsd
Expand Down
Loading

0 comments on commit 41f274d

Please sign in to comment.