Viggodevries
c30ed7372f
alpha release 1
3 år sedan
Voxin Muyli
a36765a42d
The rich text editor was broken in 3.2 alpha. This restores it. (#3979)
* Since jquery.tinymce.min.js was removed from tinymce in this commit:
tinymce/cefd238fa5
but we do need it, we need to explicitly add it as a dependency.
* clean up some build warnings
3 år sedan
Tim Gates
e994f3e5f9
docs: Fix a few typos (#3977)
There are small typos in:
- docs/source/releases/v0.5.rst
- docs/source/releases/v3.2.rst
- src/oscar/apps/offer/queryset.py
- tests/integration/basket/test_models.py
Fixes:
- Should read `threshold` rather than `treshold`.
- Should read `overridden` rather than `overidden`.
- Should read `category` rather than `catagory`.
- Should read `applications` rather than `appliations`.
Signed-off-by: Tim Gates <tim.gates@iress.com >
Signed-off-by: Tim Gates <tim.gates@iress.com >
3 år sedan
Mojtaba A
50bc9cefd9
edit added 3-rd party package link (#3969)
There was a problem with the GitHub package link that was fixed
3 år sedan
dependabot[bot]
dc807ecfb1
Update django-extensions requirement from <3.2,>=2.2 to >=2.2,<3.3 (#3963)
Updates the requirements on [django-extensions](https://github.com/django-extensions/django-extensions ) to permit the latest version.
- [Release notes](https://github.com/django-extensions/django-extensions/releases )
- [Changelog](https://github.com/django-extensions/django-extensions/blob/main/CHANGELOG.md )
- [Commits](https://github.com/django-extensions/django-extensions/compare/2.2.0...3.2.0 )
---
updated-dependencies:
- dependency-name: django-extensions
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
3 år sedan
dependabot[bot]
7b9d07d25e
Bump eslint from 8.18.0 to 8.22.0 (#3968)
Bumps [eslint](https://github.com/eslint/eslint ) from 8.18.0 to 8.22.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.18.0...v8.22.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
3 år sedan
dependabot[bot]
98af321831
Bump @fortawesome/fontawesome-free from 6.1.1 to 6.1.2 (#3959)
Bumps [@fortawesome /fontawesome-free](https://github.com/FortAwesome/Font-Awesome ) from 6.1.1 to 6.1.2.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases )
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md )
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.1.1...6.1.2 )
---
updated-dependencies:
- dependency-name: "@fortawesome /fontawesome-free"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
3 år sedan
dependabot[bot]
9e6592977b
Bump bootstrap from 4.6.1 to 4.6.2 (#3958)
Bumps [bootstrap](https://github.com/twbs/bootstrap ) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/twbs/bootstrap/releases )
- [Commits](https://github.com/twbs/bootstrap/compare/v4.6.1...v4.6.2 )
---
updated-dependencies:
- dependency-name: bootstrap
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
3 år sedan
Mojtaba A
a557cd7631
add 3rd party extention to README.srt (#3951)
add django-oscar-zarinpal-gateway as 3rd party extention to README.srt
3 år sedan
dependabot[bot]
d180b2435e
Bump sass from 1.53.0 to 1.54.0 (#3957)
Bumps [sass](https://github.com/sass/dart-sass ) from 1.53.0 to 1.54.0.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.53.0...1.54.0 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
3 år sedan
dependabot[bot]
61b3675e55
Bump tinymce from 6.0.3 to 6.1.2 (#3956)
Bumps [tinymce](https://github.com/tinymce/tinymce/tree/HEAD/modules/tinymce ) from 6.0.3 to 6.1.2.
- [Release notes](https://github.com/tinymce/tinymce/releases )
- [Changelog](https://github.com/tinymce/tinymce/blob/develop/modules/tinymce/CHANGELOG.md )
- [Commits](https://github.com/tinymce/tinymce/commits/6.1.2/modules/tinymce )
---
updated-dependencies:
- dependency-name: tinymce
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
3 år sedan
dependabot[bot]
003e66154c
Update django-debug-toolbar requirement from <3.5,>=2.2 to >=2.2,<3.6
Updates the requirements on [django-debug-toolbar](https://github.com/jazzband/django-debug-toolbar ) to permit the latest version.
- [Release notes](https://github.com/jazzband/django-debug-toolbar/releases )
- [Changelog](https://github.com/jazzband/django-debug-toolbar/blob/main/docs/changes.rst )
- [Commits](https://github.com/jazzband/django-debug-toolbar/compare/2.2...3.5 )
---
updated-dependencies:
- dependency-name: django-debug-toolbar
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
dependabot[bot]
74fb88775b
Update django-environ requirement from <0.9,>=0.4 to >=0.4,<0.10
Updates the requirements on [django-environ](https://github.com/joke2k/django-environ ) to permit the latest version.
- [Release notes](https://github.com/joke2k/django-environ/releases )
- [Changelog](https://github.com/joke2k/django-environ/blob/main/CHANGELOG.rst )
- [Commits](https://github.com/joke2k/django-environ/compare/v0.4...v0.9.0 )
---
updated-dependencies:
- dependency-name: django-environ
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
dependabot[bot]
f9dae46f8f
Bump sass from 1.52.1 to 1.53.0
Bumps [sass](https://github.com/sass/dart-sass ) from 1.52.1 to 1.53.0.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.52.1...1.53.0 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
dependabot[bot]
eae0c25831
Bump eslint from 8.16.0 to 8.18.0
Bumps [eslint](https://github.com/eslint/eslint ) from 8.16.0 to 8.18.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.16.0...v8.18.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
Viggodevries
c620c1fcc6
remove in deveopment
3 år sedan
Viggodevries
6dd8adbad4
tag version 3.2.0-alpha
3 år sedan
Joey
b5b10ed124
Prepare release notes for 3.2 (#3940)
Co-authored-by: Viggodevries <viggo@highbiza.nl >
3 år sedan
Joey
a8ad4b81d8
Implement shareable wishlists (#3905)
* Implement shareable wishlists.
* Raise permission denied 403 instead of 404 if a user has no access to the wishlist.
* Change translation messages
3 år sedan
Viggodevries
3653cd27c9
Update translations
3 år sedan
dependabot[bot]
89d7199b8d
Bump flake8-debugger from 4.0.0 to 4.1.2 (#3920)
Bumps [flake8-debugger](https://github.com/jbkahn/flake8-debugger ) from 4.0.0 to 4.1.2.
- [Release notes](https://github.com/jbkahn/flake8-debugger/releases )
- [Commits](https://github.com/jbkahn/flake8-debugger/compare/4.0.0...4.1.2 )
---
updated-dependencies:
- dependency-name: flake8-debugger
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
3 år sedan
Craig Weber
469d2e76b1
Bump max version of django-extra-views to 0.15 (#3937)
3 år sedan
Craig Weber
d00dc0046b
Bump max version of django-phonenumber-field to 7.0.0 (#3936)
3 år sedan
dependabot[bot]
9c68abfcc0
Bump tempusdominus-bootstrap-4 from 5.39.0 to 5.39.2 (#3915)
Bumps [tempusdominus-bootstrap-4](https://github.com/tempusdominus/bootstrap-4 ) from 5.39.0 to 5.39.2.
- [Release notes](https://github.com/tempusdominus/bootstrap-4/releases )
- [Commits](https://github.com/tempusdominus/bootstrap-4/commits )
---
updated-dependencies:
- dependency-name: tempusdominus-bootstrap-4
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
3 år sedan
Craig Weber
d5387656fe
Revert "Pin treebeard dependency to <4.5" (#3935)
* Revert "Pin treebeard dependency to <4.5"
This reverts commit e37df74d77 .
* Fix bug with dashboard redirect when upgrading to treebeard>=4.5
3 år sedan
Viggo de Vries
663ca69d2f
Add basket post data to the form when invalid (#3911)
3 år sedan
Joey
a4c029d6d6
Merge pull request #3934 from django-oscar/dependabot/pip/whitenoise-gte-5.2-and-lt-6.3
Update whitenoise requirement from <6.1,>=5.2 to >=5.2,<6.3
3 år sedan
Joey
1db688c1cb
Merge pull request #3925 from django-oscar/dependabot/npm_and_yarn/tinymce-6.0.3
Bump tinymce from 5.10.3 to 6.0.3
3 år sedan
dependabot[bot]
13d470bee6
Update whitenoise requirement from <6.1,>=5.2 to >=5.2,<6.3
Updates the requirements on [whitenoise](https://github.com/evansd/whitenoise ) to permit the latest version.
- [Release notes](https://github.com/evansd/whitenoise/releases )
- [Changelog](https://github.com/evansd/whitenoise/blob/main/docs/changelog.rst )
- [Commits](https://github.com/evansd/whitenoise/compare/v5.2.0...6.2.0 )
---
updated-dependencies:
- dependency-name: whitenoise
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
Joey
b573f5d78c
Merge pull request #3930 from django-oscar/dependabot/pip/redis-gte-3.5-and-lt-4.4
Update redis requirement from <4.2,>=3.5 to >=3.5,<4.4
3 år sedan
Joey
49c8dd7396
Merge pull request #3927 from django-oscar/dependabot/npm_and_yarn/eslint-8.16.0
Bump eslint from 8.13.0 to 8.16.0
3 år sedan
Joey
df36aa3b9f
Merge pull request #3926 from django-oscar/dependabot/npm_and_yarn/nan-2.16.0
Bump nan from 2.15.0 to 2.16.0
3 år sedan
dependabot[bot]
53dd1dd48b
Bump nan from 2.15.0 to 2.16.0
Bumps [nan](https://github.com/nodejs/nan ) from 2.15.0 to 2.16.0.
- [Release notes](https://github.com/nodejs/nan/releases )
- [Changelog](https://github.com/nodejs/nan/blob/main/CHANGELOG.md )
- [Commits](https://github.com/nodejs/nan/compare/v2.15.0...v2.16.0 )
---
updated-dependencies:
- dependency-name: nan
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
Joey
161f9047ee
Merge pull request #3928 from django-oscar/dependabot/npm_and_yarn/sass-1.52.1
Bump sass from 1.49.10 to 1.52.1
3 år sedan
Joey
946cbdb7dc
Merge pull request #3931 from django-oscar/dependabot/pip/django-debug-toolbar-gte-2.2-and-lt-3.5
Update django-debug-toolbar requirement from <3.3,>=2.2 to >=2.2,<3.5
3 år sedan
dependabot[bot]
c98aa1defc
Update django-debug-toolbar requirement from <3.3,>=2.2 to >=2.2,<3.5
Updates the requirements on [django-debug-toolbar](https://github.com/jazzband/django-debug-toolbar ) to permit the latest version.
- [Release notes](https://github.com/jazzband/django-debug-toolbar/releases )
- [Changelog](https://github.com/jazzband/django-debug-toolbar/blob/main/docs/changes.rst )
- [Commits](https://github.com/jazzband/django-debug-toolbar/compare/2.2...3.4 )
---
updated-dependencies:
- dependency-name: django-debug-toolbar
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
dependabot[bot]
abbb038d18
Update redis requirement from <4.2,>=3.5 to >=3.5,<4.4
Updates the requirements on [redis](https://github.com/redis/redis-py ) to permit the latest version.
- [Release notes](https://github.com/redis/redis-py/releases )
- [Changelog](https://github.com/redis/redis-py/blob/master/CHANGES )
- [Commits](https://github.com/redis/redis-py/compare/3.5.0...v4.3.1 )
---
updated-dependencies:
- dependency-name: redis
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
dependabot[bot]
f6bb8581ff
Bump sass from 1.49.10 to 1.52.1
Bumps [sass](https://github.com/sass/dart-sass ) from 1.49.10 to 1.52.1.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.49.10...1.52.1 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
dependabot[bot]
3016073ee8
Bump eslint from 8.13.0 to 8.16.0
Bumps [eslint](https://github.com/eslint/eslint ) from 8.13.0 to 8.16.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.13.0...v8.16.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
dependabot[bot]
5dc14b033b
Bump tinymce from 5.10.3 to 6.0.3
Bumps [tinymce](https://github.com/tinymce/tinymce/tree/HEAD/modules/tinymce ) from 5.10.3 to 6.0.3.
- [Release notes](https://github.com/tinymce/tinymce/releases )
- [Changelog](https://github.com/tinymce/tinymce/blob/develop/modules/tinymce/CHANGELOG.md )
- [Commits](https://github.com/tinymce/tinymce/commits/6.0.3/modules/tinymce )
---
updated-dependencies:
- dependency-name: tinymce
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
Joey
ce125497f0
Merge pull request #3922 from viggo-devries/consume_atomic_state
Atomically consume allocations and stock
3 år sedan
Viggodevries
18c87ef69b
atomically consume allocations and stock
3 år sedan
naveen
a417b05f94
chore: Set permissions for GitHub actions
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.
- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs
[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/ )
Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com >
3 år sedan
Joey
4d289423be
Fix that the condition form required a range when choosing a custom condition (#3886)
* Fix that the condition form required a range when choosing a custom condition
* Implement condition type validation on model.
3 år sedan
Joey
2fe6c3967f
Merge pull request #3912 from django-oscar/dependabot/npm_and_yarn/eslint-8.13.0
Bump eslint from 8.10.0 to 8.13.0
3 år sedan
Joey
382f46fa38
Merge pull request #3902 from django-oscar/dependabot/npm_and_yarn/sass-1.49.10
Bump sass from 1.49.9 to 1.49.10
3 år sedan
dependabot[bot]
0d9c900cd2
Bump eslint from 8.10.0 to 8.13.0
Bumps [eslint](https://github.com/eslint/eslint ) from 8.10.0 to 8.13.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.10.0...v8.13.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
Joey
3b29c095cf
Merge pull request #3900 from django-oscar/dependabot/npm_and_yarn/fortawesome/fontawesome-free-6.1.1
Bump @fortawesome /fontawesome-free from 6.1.0 to 6.1.1
3 år sedan
dependabot[bot]
bc11080da5
Bump sass from 1.49.9 to 1.49.10
Bumps [sass](https://github.com/sass/dart-sass ) from 1.49.9 to 1.49.10.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.49.9...1.49.10 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
dependabot[bot]
9e986d5bff
Bump @fortawesome/fontawesome-free from 6.1.0 to 6.1.1
Bumps [@fortawesome /fontawesome-free](https://github.com/FortAwesome/Font-Awesome ) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases )
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md )
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.1.0...6.1.1 )
---
updated-dependencies:
- dependency-name: "@fortawesome /fontawesome-free"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan