Samar Hassan
baa258e730
feat :star: allow sorting users using their order count
2 vuotta sitten
Samar Hassan
e5f88bfe96
feat :star: optimize order count in user listing page
2 vuotta sitten
Samar Hassan
ca1f0d609b
feat :star: reduce db calls in dashboard user detail page (#4051)
2 vuotta sitten
nathanhighbiza
41ffbda8ad
orderlist view added email when there isn't a name (#4009)
2 vuotta sitten
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 vuotta sitten
Voxin Muyli
4b9c833a8a
post_save_set_ancestors_are_public should not run when loading fixtures, (#4040)
The fixtures should contain the correct data.
2 vuotta sitten
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 vuotta sitten
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 vuotta sitten
Viggodevries
151dc05395
Release 3.2 final LTS
2 vuotta sitten
Viggodevries
40ca677869
Update translations
2 vuotta sitten
Viggodevries
fe1a82387e
Add 3.2 LTS to Readme
2 vuotta sitten
Voxin Muyli
41efb274b0
Merge pull request #4025 from django-oscar/320b1
Prepare for 3.2.0b1 release
2 vuotta sitten
Joey Jurjens
5cc12383c9
Prepare for 3.2.0b1 release
2 vuotta sitten
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 vuotta sitten
Viggodevries
44ce5c3bde
Release 3.2.0-beta
2 vuotta sitten
Viggodevries
68b773acab
Update translations
2 vuotta sitten
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 vuotta sitten
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 vuotta sitten
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 vuotta sitten
Voxin Muyli
cf40cdb81d
Merge pull request #4002 from gwaidacher/patch-1
Update catalogue search_handlers.py
2 vuotta sitten
gwaidacher
3b883b877f
Update search_handlers.py
Fixed import order at line 8
3 vuotta sitten
Joey
a253f65ab6
Alpha 4 release (#4001)
3 vuotta sitten
Voxin Muyli
34fa17ef05
Merge pull request #4000 from django-oscar/fix_order_report_download
Fix set has no values error on orders download
3 vuotta sitten
Joey Jurjens
18a9697c98
Fix set has no values error on orders download
3 vuotta sitten
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 vuotta sitten
Viggodevries
c9c3c8a5e6
alpha 3 release
3 vuotta sitten
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 vuotta sitten
Voxin Muyli
3e11b0955a
In the new tinymce styleselect has been renamed to styles. (#3990)
The style_formats where not showing because of this.
3 vuotta sitten
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 vuotta sitten
Viggodevries
a46eea7180
bump version
3 vuotta sitten
Viggo de Vries
13b34ea5d2
all line attributes should be converted. (#3985)
3 vuotta sitten
Voxin Muyli
0be51c697c
Fixes missing label changes in migration (#3984)
3 vuotta sitten
Voxin Muyli
bfe5339a78
Convert existing data to valid json before migrating the value to JSONField (#3983)
3 vuotta sitten
Viggodevries
c30ed7372f
alpha release 1
3 vuotta sitten
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 vuotta sitten
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 vuotta sitten
Mojtaba A
50bc9cefd9
edit added 3-rd party package link (#3969)
There was a problem with the GitHub package link that was fixed
3 vuotta sitten
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 vuotta sitten
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 vuotta sitten
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 vuotta sitten
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 vuotta sitten
Mojtaba A
a557cd7631
add 3rd party extention to README.srt (#3951)
add django-oscar-zarinpal-gateway as 3rd party extention to README.srt
3 vuotta sitten
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 vuotta sitten
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 vuotta sitten
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 vuotta sitten
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 vuotta sitten
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 vuotta sitten
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 vuotta sitten
Viggodevries
c620c1fcc6
remove in deveopment
3 vuotta sitten
Viggodevries
6dd8adbad4
tag version 3.2.0-alpha
3 vuotta sitten