Viggodevries
56e438ca1d
Revert "fix for #4049 (#4050)"
This reverts commit f3b2d2eb20 .
2 роки тому
Voxin Muyli
a2515f14eb
Merge pull request #4064 from django-oscar/dependabot/pip/whitenoise-gte-5.2-and-lt-6.5
Update whitenoise requirement from <6.3,>=5.2 to >=5.2,<6.5
2 роки тому
mghiglieri
f3b2d2eb20
fix for #4049 (#4050)
* fix for #4049
2 роки тому
dependabot[bot]
6e757b37a6
Update whitenoise requirement from <6.3,>=5.2 to >=5.2,<6.5
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.4.0 )
---
updated-dependencies:
- dependency-name: whitenoise
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2 роки тому
Voxin Muyli
a77a493214
Merge pull request #4061 from samar-hassan/samar/optimise-user-order-count
[FEAT] Optimize order count calculation in user listing page
2 роки тому
dimka
dc4577e373
fix: Removing unnecessary permissions from static and documentation files (#4067)
2 роки тому
dimka
c49a21979e
Fix review list template (#4014)
* fix: Review template layout fix
* fix: Removing unnecessary permissions from static and documentation files
* Revert "fix: Removing unnecessary permissions from static and documentation files"
This reverts commit 9e342199b6 .
2 роки тому
Samar Hassan
93978d9c0b
Optimize range products reordering (#4010)
* feat :star: optimize range products reordering
* test :white_check_mark: add test to verify range product reordering
* fix :wrench: remove local settings from test settings
* test :white_check_mark: update product reordering test
2 роки тому
Samar Hassan
7ffff02388
fix :wrench: show address update button only if there exists one (#4044)
2 роки тому
Gunther Waidacher
75ed8827bd
Exclude non-public Products from Offers detail and Range detail view (#4053)
* Non-public Products are shown in Offers
2 роки тому
Samar Hassan
f72a6f9c89
fix :bug: exclude suspended offers in offer listing (#4059)
2 роки тому
Samar Hassan
8543c60c36
chore :recycle: add relevant user record in orders fixture
2 роки тому
Samar Hassan
baa258e730
feat :star: allow sorting users using their order count
2 роки тому
Samar Hassan
e5f88bfe96
feat :star: optimize order count in user listing page
2 роки тому
Samar Hassan
ca1f0d609b
feat :star: reduce db calls in dashboard user detail page (#4051)
2 роки тому
nathanhighbiza
41ffbda8ad
orderlist view added email when there isn't a name (#4009)
2 роки тому
Samar Hassan
d203c07355
Fix combination offer removal bug (#4017)
* fix :bug: remove combination offer in both offers
* feat :star: add test to check offer removal from combinations
2 роки тому
Voxin Muyli
4b9c833a8a
post_save_set_ancestors_are_public should not run when loading fixtures, (#4040)
The fixtures should contain the correct data.
2 роки тому
dependabot[bot]
3c679aaafe
Bump sass from 1.54.0 to 1.58.0 (#4045)
Bumps [sass](https://github.com/sass/dart-sass ) from 1.54.0 to 1.58.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.54.0...1.58.0 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:development
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 >
2 роки тому
dependabot[bot]
44c1ba7bbc
Bump eslint from 8.22.0 to 8.33.0 (#4047)
Bumps [eslint](https://github.com/eslint/eslint ) from 8.22.0 to 8.33.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.22.0...v8.33.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
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 >
2 роки тому
Viggodevries
151dc05395
Release 3.2 final LTS
2 роки тому
Viggodevries
40ca677869
Update translations
2 роки тому
Viggodevries
fe1a82387e
Add 3.2 LTS to Readme
2 роки тому
Voxin Muyli
41efb274b0
Merge pull request #4025 from django-oscar/320b1
Prepare for 3.2.0b1 release
2 роки тому
Joey Jurjens
5cc12383c9
Prepare for 3.2.0b1 release
2 роки тому
Voxin Muyli
c4ebfa680f
Deepcopy should not cause a recursion error on the ProductAttributesC… (#4018)
* Deepcopy should not cause a recursion error on the ProductAttributesContainer
2 роки тому
Viggodevries
44ce5c3bde
Release 3.2.0-beta
2 роки тому
Viggodevries
68b773acab
Update translations
2 роки тому
Voxin Muyli
993e8a6cb6
Specify translation context, so the value can be easily changed in a … (#4012)
Specify translation context, so the value can be easily changed in a project if needed.
2 роки тому
wlaw01
3dee0ae8fb
show boolean option value to yes/no in stead of true/false (#4005)
* show boolean option value to yes/no in stead of true/false
* remove brackets
* add unit test
Co-authored-by: Wai Law <jan@uwkm.nl >
2 роки тому
Voxin Muyli
71405c508a
Avoid unexpected behaviour when saving modified child attributes. (#4007)
This fixes the issue where modifying child properties would have no effect in
the dashboard, if the parent would have the same property. This is not directly
obvious in the dashboard context. Allowing child attributes to be saved if they
are directly modified even if they are the same, avoid confusion.
2 роки тому
Voxin Muyli
cf40cdb81d
Merge pull request #4002 from gwaidacher/patch-1
Update catalogue search_handlers.py
2 роки тому
gwaidacher
3b883b877f
Update search_handlers.py
Fixed import order at line 8
3 роки тому
Joey
a253f65ab6
Alpha 4 release (#4001)
3 роки тому
Voxin Muyli
34fa17ef05
Merge pull request #4000 from django-oscar/fix_order_report_download
Fix set has no values error on orders download
3 роки тому
Joey Jurjens
18a9697c98
Fix set has no values error on orders download
3 роки тому
Voxin Muyli
311383c970
Show boolean not required error (#3997)
It makes no sense to have a boolean attribute that is required, because it
makes people have to check that box for every product they edit. Now let's
also show people the error that will be thrown when that happens, for clarity.
3 роки тому
Viggodevries
c9c3c8a5e6
alpha 3 release
3 роки тому
Voxin Muyli
6f333f6564
Make sure to only save attributes when they have been changed. (#3995)
* Make sure to only save attributes when they have been saved.
This makes sure attributes on the parent are not needlessly saved to the child.
* Renamed testcase
* Added tests for child product attributes not copying parent attributes
* Make ProductAttributesContainer even more lazy and initialize only when an attribute is being read.
* Changed docstring
3 роки тому
Voxin Muyli
3e11b0955a
In the new tinymce styleselect has been renamed to styles. (#3990)
The style_formats where not showing because of this.
3 роки тому
Joey
a07cca3b00
fix 0024_remove_duplicate_attributes.py (#3989)
* 0024_remove_duplicate_attributes.py handle multiple attribute values with same attribute code
* Use _get_value instead of copying the method
3 роки тому
Viggodevries
a46eea7180
bump version
3 роки тому
Viggo de Vries
13b34ea5d2
all line attributes should be converted. (#3985)
3 роки тому
Voxin Muyli
0be51c697c
Fixes missing label changes in migration (#3984)
3 роки тому
Voxin Muyli
bfe5339a78
Convert existing data to valid json before migrating the value to JSONField (#3983)
3 роки тому
Viggodevries
c30ed7372f
alpha release 1
3 роки тому
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 роки тому
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 роки тому
Mojtaba A
50bc9cefd9
edit added 3-rd party package link (#3969)
There was a problem with the GitHub package link that was fixed
3 роки тому
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 роки тому