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 years ago
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 years ago
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 years ago
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 years ago
Joey
ce125497f0
Merge pull request #3922 from viggo-devries/consume_atomic_state
Atomically consume allocations and stock
3 years ago
Viggodevries
18c87ef69b
atomically consume allocations and stock
3 years ago
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 years ago
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 years ago
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 years ago
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 years ago
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 years ago
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 years ago
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 years ago
Voxin Muyli
fe37a51c04
Merge pull request #3873 from SaturnFromTitan/3872-orderfactory-breaks-if-settings-site_id-isn-t-set
[#3872 ] OrderFactory doesn't require settings.SITE_ID to be set anymore
3 years ago
Joey
67c1e6002c
Merge pull request #3895 from st8st8/master
Made order basket read only
3 years ago
Steve Bradshaw
1eb9f6b97c
Made order basket read only
3 years ago
Joey
ff1d0f9539
Merge pull request #3894 from django-oscar/dependabot/npm_and_yarn/fortawesome/fontawesome-free-6.1.0
Bump @fortawesome /fontawesome-free from 5.15.4 to 6.1.0
3 years ago
Joey
09d85203fa
Merge pull request #3882 from django-oscar/dependabot/pip/whitenoise-gte-5.2-and-lt-6.1
Update whitenoise requirement from <5.4,>=5.2 to >=5.2,<6.1
3 years ago
Joey
494242071c
Merge pull request #3879 from django-oscar/dependabot/npm_and_yarn/sass-1.49.9
Bump sass from 1.49.7 to 1.49.9
3 years ago
Joey
f65902c6be
Merge pull request #3878 from django-oscar/dependabot/npm_and_yarn/tinymce-5.10.3
Bump tinymce from 5.10.2 to 5.10.3
3 years ago
dependabot[bot]
4dd9d04850
Bump @fortawesome/fontawesome-free from 5.15.4 to 6.1.0
Bumps [@fortawesome /fontawesome-free](https://github.com/FortAwesome/Font-Awesome ) from 5.15.4 to 6.1.0.
- [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/5.15.4...6.1.0 )
---
updated-dependencies:
- dependency-name: "@fortawesome /fontawesome-free"
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
3 years ago
Joey
c91861a08f
Merge pull request #3877 from django-oscar/dependabot/npm_and_yarn/eslint-8.10.0
Bump eslint from 8.8.0 to 8.10.0
3 years ago
Joey
1dda8b5ad7
Fix the issue where html5 validation errors were not obvious, because they were not displayed. (#3892)
3 years ago
Voxin Muyli
2d71a08248
Merge pull request #3887 from django-oscar/add_catalogue_merge_migration
Added catalogue merge migration
3 years ago
Joey Jurjens
a8bb2004a4
Use full_clean() to check the validation.
3 years ago
joeyjurjens
57966537f9
Rename duplicate migration and add earlier migrations to the test migrations
3 years ago
joeyjurjens
b769743182
Added catalogue merge migration
3 years ago
Voxin Muyli
0a01977e9c
Predefined product options (#3795)
* Implemented predefined product options
* css
* added missing migration in the test app
* Added tests
* added test
* added test
* Added more testz
* Added validation
* Renamed add_optional_choice to add_empty_choice
* added release notes
* Added help_text help text.
yup
* Use a JSONField for the option value
* removed pylint
* fix display of multi and checkbox in basket and order (#13 )
* fix display of multi and checkbox in basket and order
Co-authored-by: willeke huizing <38961397 +willekeh@users.noreply.github.com >
3 years ago
Voxin Muyli
cb77fcba06
Merge pull request #3884 from solarissmoke/fix/usefirststockrecord-extra-query
Prevent unnecessary database query in UseFirstStockRecord strategy when passed an annotated product.
3 years ago
Samir Shah
a150206cd1
Prevent unnecessary database query in UseFirstStockRecord strategy when passed an annotated product.
3 years ago
dependabot[bot]
b3f993fc83
Update whitenoise requirement from <5.4,>=5.2 to >=5.2,<6.1
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/master/docs/changelog.rst )
- [Commits](https://github.com/evansd/whitenoise/compare/v5.2.0...6.0.0 )
---
updated-dependencies:
- dependency-name: whitenoise
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
3 years ago
dependabot[bot]
f025ecd3c1
Bump sass from 1.49.7 to 1.49.9
Bumps [sass](https://github.com/sass/dart-sass ) from 1.49.7 to 1.49.9.
- [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.7...1.49.9 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
3 years ago
dependabot[bot]
349895e503
Bump tinymce from 5.10.2 to 5.10.3
Bumps [tinymce](https://github.com/tinymce/tinymce/tree/HEAD/modules/tinymce ) from 5.10.2 to 5.10.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/5.10.3/modules/tinymce )
---
updated-dependencies:
- dependency-name: tinymce
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
3 years ago
dependabot[bot]
dfbc2bcebd
Bump eslint from 8.8.0 to 8.10.0
Bumps [eslint](https://github.com/eslint/eslint ) from 8.8.0 to 8.10.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.8.0...v8.10.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 years ago
Martin Winkel
23013a61a1
Use as_stars template filter instead of very long if/else statement (#3871)
3 years ago
Martin Winkel
73567d8746
use getattr instead of lazyattribute
3 years ago
Joey
f1d3afb7d5
Make attribute codes unique per product class (#3823)
3 years ago
Martin Winkel
5bba3a78c7
[#3872] OrderFactory breaks if settings.SITE_ID isn't set
3 years ago
Voxin Muyli
34c4a1b344
Implement a much more efficient approach to range queries. (#3831)
3 years ago
Alexander Gaevsky
c87a4d88ca
Fix handling of InvalidPage exceptions in CatalogueView (#3505)
3 years ago
dependabot[bot]
f277e60f0a
Bump sass from 1.45.2 to 1.49.7
Bumps [sass](https://github.com/sass/dart-sass ) from 1.45.2 to 1.49.7.
- [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.45.2...1.49.7 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
3 years ago
Alexander Gaevsky
7da350296a
Add nan to the development frontend dependencies in order to fix build on the Node 17.
3 years ago
dependabot[bot]
c05353a76d
Update ipython requirement from <8,>=7.12 to >=7.12,<9
Updates the requirements on [ipython](https://github.com/ipython/ipython ) to permit the latest version.
- [Release notes](https://github.com/ipython/ipython/releases )
- [Commits](https://github.com/ipython/ipython/compare/7.12.0...8.0.1 )
---
updated-dependencies:
- dependency-name: ipython
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
3 years ago
dependabot[bot]
bf3bbed184
Bump eslint from 8.6.0 to 8.8.0
Bumps [eslint](https://github.com/eslint/eslint ) from 8.6.0 to 8.8.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.6.0...v8.8.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 years ago
Voxin Muyli
c8b5a9c5c2
Merge pull request #3858 from solarissmoke/fix/related-multiple-escape
Remove links for editing/deleting related objects from RelatedMultipleWidgetWrapper
3 years ago
dependabot[bot]
4a95c3a805
Update django-redis requirement from <5.2,>=4.12 to >=4.12,<5.3
Updates the requirements on [django-redis](https://github.com/jazzband/django-redis ) to permit the latest version.
- [Release notes](https://github.com/jazzband/django-redis/releases )
- [Changelog](https://github.com/jazzband/django-redis/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/jazzband/django-redis/compare/4.12.0...5.2.0 )
---
updated-dependencies:
- dependency-name: django-redis
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
3 years ago
dependabot[bot]
83f66cc652
Bump copy-props from 2.0.4 to 2.0.5
Bumps [copy-props](https://github.com/gulpjs/copy-props ) from 2.0.4 to 2.0.5.
- [Release notes](https://github.com/gulpjs/copy-props/releases )
- [Changelog](https://github.com/gulpjs/copy-props/blob/master/CHANGELOG.md )
- [Commits](https://github.com/gulpjs/copy-props/compare/2.0.4...2.0.5 )
---
updated-dependencies:
- dependency-name: copy-props
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
3 years ago
Basil Dubyk
f067c582c2
Add `search_fields` to `AbstractAddress` model
Similarly to `base_fields` and `hash_fields` it will be easier to
override fields for the search text.
Without this change to add/remove fields from search text we need to
override the `_update_search_text` method.
3 years ago
Martin Winkel
e639068493
Mark button/link text in email template as translatable
3 years ago
dependabot[bot]
6b490a8d97
Bump inputmask from 5.0.6 to 5.0.7
Bumps [inputmask](https://github.com/RobinHerbots/Inputmask ) from 5.0.6 to 5.0.7.
- [Release notes](https://github.com/RobinHerbots/Inputmask/releases )
- [Changelog](https://github.com/RobinHerbots/Inputmask/blob/5.x/CHANGELOG.md )
- [Commits](https://github.com/RobinHerbots/Inputmask/compare/5.0.6...5.0.7 )
---
updated-dependencies:
- dependency-name: inputmask
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
3 years ago