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 år sedan
Joey
67c1e6002c
Merge pull request #3895 from st8st8/master
Made order basket read only
3 år sedan
Steve Bradshaw
1eb9f6b97c
Made order basket read only
3 år sedan
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 år sedan
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 år sedan
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 år sedan
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 år sedan
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 år sedan
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 år sedan
Joey
1dda8b5ad7
Fix the issue where html5 validation errors were not obvious, because they were not displayed. (#3892)
3 år sedan
Voxin Muyli
2d71a08248
Merge pull request #3887 from django-oscar/add_catalogue_merge_migration
Added catalogue merge migration
3 år sedan
Joey Jurjens
a8bb2004a4
Use full_clean() to check the validation.
3 år sedan
joeyjurjens
57966537f9
Rename duplicate migration and add earlier migrations to the test migrations
3 år sedan
joeyjurjens
b769743182
Added catalogue merge migration
3 år sedan
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 år sedan
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 år sedan
Samir Shah
a150206cd1
Prevent unnecessary database query in UseFirstStockRecord strategy when passed an annotated product.
3 år sedan
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 år sedan
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 år sedan
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 år sedan
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 år sedan
Martin Winkel
23013a61a1
Use as_stars template filter instead of very long if/else statement (#3871)
3 år sedan
Martin Winkel
73567d8746
use getattr instead of lazyattribute
3 år sedan
Joey
f1d3afb7d5
Make attribute codes unique per product class (#3823)
3 år sedan
Martin Winkel
5bba3a78c7
[#3872] OrderFactory breaks if settings.SITE_ID isn't set
3 år sedan
Voxin Muyli
34c4a1b344
Implement a much more efficient approach to range queries. (#3831)
3 år sedan
Alexander Gaevsky
c87a4d88ca
Fix handling of InvalidPage exceptions in CatalogueView (#3505)
3 år sedan
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 år sedan
Alexander Gaevsky
7da350296a
Add nan to the development frontend dependencies in order to fix build on the Node 17.
3 år sedan
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 år sedan
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 år sedan
Voxin Muyli
c8b5a9c5c2
Merge pull request #3858 from solarissmoke/fix/related-multiple-escape
Remove links for editing/deleting related objects from RelatedMultipleWidgetWrapper
3 år sedan
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 år sedan
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 år sedan
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 år sedan
Martin Winkel
e639068493
Mark button/link text in email template as translatable
3 år sedan
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 år sedan
dependabot[bot]
48db14c349
Update redis requirement from <4.1,>=3.5 to >=3.5,<4.2
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.1.0 )
---
updated-dependencies:
- dependency-name: redis
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
Martin Winkel
e407d996e9
Fix display of user in orders placed report, to show name instead of email (#3851)
3 år sedan
Martin Winkel
02631fcb91
Fix table layout on anon order page when reviews are disabled (#3849)
3 år sedan
Samir Shah
59448c826f
Remove links for editing/deleting related objects from RelatedMultipleWidgetWrapper.
Adding HTML markup into each option requires disabling HTML escaping on
the option, which means the option name is also not escaped. While this
is not a very high risk, these extra links add marginal extra utility
and require a fair bit of Javascript, so it seems to be better just to
remove them.
3 år sedan
dependabot[bot]
ffcc530844
Bump node-sass from 6.0.1 to 7.0.1
Bumps [node-sass](https://github.com/sass/node-sass ) from 6.0.1 to 7.0.1.
- [Release notes](https://github.com/sass/node-sass/releases )
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/node-sass/compare/v6.0.1...v7.0.1 )
---
updated-dependencies:
- dependency-name: node-sass
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
Joey Jurjens
3368352ff4
Add pagination partial to the stock alert list template
3 år sedan
dependabot[bot]
a4b1af61bb
Bump gulp-sass from 5.0.0 to 5.1.0
Bumps [gulp-sass](https://github.com/dlmanning/gulp-sass ) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/dlmanning/gulp-sass/releases )
- [Changelog](https://github.com/dlmanning/gulp-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/dlmanning/gulp-sass/compare/v5.0.0...v5.1.0 )
---
updated-dependencies:
- dependency-name: gulp-sass
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
3 år sedan
dependabot[bot]
721194623a
Bump eslint from 8.3.0 to 8.6.0
Bumps [eslint](https://github.com/eslint/eslint ) from 8.3.0 to 8.6.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.3.0...v8.6.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]
470e1a6658
Bump sass from 1.44.0 to 1.45.2
Bumps [sass](https://github.com/sass/dart-sass ) from 1.44.0 to 1.45.2.
- [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.44.0...1.45.2 )
---
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
Martin Winkel
f16e87f2d0
added release note about the deprecation
3 år sedan
Martin Winkel
6eceb19a59
[#3826] Streamline handling of links in email templates
3 år sedan
Voxin Muyli
6e8c525a30
Merge pull request #3839 from sasha0/fix/notification_body
Do not escape HTML in the notification body on the customer notification detail page.
3 år sedan
Kees Hink
946ff6b35f
Link to Oscar 2.2 from release notes
3 år sedan