Voxin Muyli
4d0a5ba5d3
Merge pull request #4022 from django-oscar/dependabot/npm_and_yarn/node-sass-8.0.0
Bump node-sass from 7.0.1 to 8.0.0
hace 2 años
Lars van de Kerkhof
8d545105ec
flake8 6 requires a too large version of python
hace 2 años
dependabot[bot]
ab7171c6c5
Bump node-sass from 7.0.1 to 8.0.0
Bumps [node-sass](https://github.com/sass/node-sass ) from 7.0.1 to 8.0.0.
- [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/v7.0.1...v8.0.0 )
---
updated-dependencies:
- dependency-name: node-sass
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
hace 2 años
Voxin Muyli
6cf61334e2
Merge pull request #3998 from django-oscar/dependabot/npm_and_yarn/nan-2.17.0
Bump nan from 2.16.0 to 2.17.0
hace 2 años
dependabot[bot]
49283be3f2
Bump flake8 from 4.0.1 to 6.0.0 (#4021)
* Bump flake8 from 4.0.1 to 6.0.0
Bumps [flake8](https://github.com/pycqa/flake8 ) from 4.0.1 to 6.0.0.
- [Release notes](https://github.com/pycqa/flake8/releases )
- [Commits](https://github.com/pycqa/flake8/compare/4.0.1...6.0.0 )
---
updated-dependencies:
- dependency-name: flake8
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
* Fixes pyflakes errors
---------
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
Co-authored-by: Lars van de Kerkhof <lars@permanentmarkers.nl >
hace 2 años
Caio Jhonny
5905bc9ffb
Update getting_started.rst (#3991)
* remove in deveopment (#3941 )
* Update getting_started.rst
Missing pip installation for virtualenv instructions
* Update getting_started.rst
---------
Co-authored-by: Viggo de Vries <viggo@highbiza.nl >
Co-authored-by: Voxin Muyli <lars@permanentmarkers.nl >
hace 2 años
Gunther Waidacher
26d57aea0e
Update how_to_integrate_payment.rst (#4087)
Added example how to integrate 'cash-on-delivery'
hace 2 años
Voxin Muyli
d847076909
Merge pull request #3914 from turrisxyz/setup-permissions
chore: Set permissions for GitHub actions
hace 2 años
Voxin Muyli
ef4e0a511a
Merge pull request #3996 from django-oscar/basket_voucher_from_voucherset_name
Use voucher_set name for vouchers in basket totals template
hace 2 años
dependabot[bot]
07c0bb2d49
Bump tinymce from 6.1.2 to 6.4.2
Bumps [tinymce](https://github.com/tinymce/tinymce/tree/HEAD/modules/tinymce ) from 6.1.2 to 6.4.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.4.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 >
hace 2 años
dependabot[bot]
53b0deb765
Bump eslint from 8.33.0 to 8.39.0 (#4090)
Bumps [eslint](https://github.com/eslint/eslint ) from 8.33.0 to 8.39.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.33.0...v8.39.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 >
hace 2 años
Alexey
55b3773050
i18n fixes (#3965)
* i18n fixes
Use i18n for search placeholder
Add i18n usage for Surcharge and Range abstract models where it was
missing
* Add trans to aria-label
* Add missing verbose names in migrations
---------
Co-authored-by: Viggodevries <viggo@highbiza.nl >
hace 2 años
Voxin Muyli
675ad831f3
Merge pull request #4097 from django-oscar/fix_makemigrations_issues
Add default auto field for django 3
hace 2 años
Viggodevries
9bf66a51b4
Add default auto field for django 3
hace 2 años
Voxin Muyli
e7a5c538a4
Merge pull request #4093 from django-oscar/dependabot/npm_and_yarn/sass-1.62.1
Bump sass from 1.58.0 to 1.62.1
hace 2 años
Voxin Muyli
44342df462
Create SECURITY.md (#4094)
* Create SECURITY.md
* Update SECURITY.md
Use github private reporting
hace 2 años
Gunther Waidacher
a01ae6b5dd
Update how_to_setup_solr.rst (#4085)
Added instructions to add custom product attributes to Solr index and OSCAR_SEARCH_FACETS
hace 2 años
Voxin Muyli
a5316f1844
Merge pull request #4084 from samar-hassan/samar/optimize-voucher-listing
Reduce db calls by counting offers in voucher listing
hace 2 años
Voxin Muyli
4355c14855
Merge pull request #4091 from django-oscar/dependabot/pip/django-debug-toolbar-gte-2.2-and-lt-4.1
Update django-debug-toolbar requirement from <3.6,>=2.2 to >=2.2,<4.1
hace 2 años
Joey
3f7101a529
Exclusivevoucherbug (#4095)
* fix that a exclusive voucher is really exclusive
* add test
* consume offer 2 instead of 1
* fix that a exclusive voucher is really exclusive
* add test
* consume offer 2 instead of 1
* test 2.0
* Add proper test for multiple vouchers
---------
Co-authored-by: wessel <wessel@highbiza.nl >
hace 2 años
dependabot[bot]
0fdc5d91be
Update django-environ requirement from <0.10,>=0.4 to >=0.4,<0.11 (#4078)
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.10.0 )
---
updated-dependencies:
- dependency-name: django-environ
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
hace 2 años
dependabot[bot]
6378b139ff
Bump sass from 1.58.0 to 1.62.1
Bumps [sass](https://github.com/sass/dart-sass ) from 1.58.0 to 1.62.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.58.0...1.62.1 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
hace 2 años
dependabot[bot]
da72362279
Bump jquery from 3.6.0 to 3.6.4 (#4076)
Bumps [jquery](https://github.com/jquery/jquery ) from 3.6.0 to 3.6.4.
- [Release notes](https://github.com/jquery/jquery/releases )
- [Commits](https://github.com/jquery/jquery/compare/3.6.0...3.6.4 )
---
updated-dependencies:
- dependency-name: jquery
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 >
hace 2 años
dependabot[bot]
1dc72e7d9e
Bump @fortawesome/fontawesome-free from 6.1.2 to 6.4.0 (#4075)
Bumps [@fortawesome /fontawesome-free](https://github.com/FortAwesome/Font-Awesome ) from 6.1.2 to 6.4.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/6.1.2...6.4.0 )
---
updated-dependencies:
- dependency-name: "@fortawesome /fontawesome-free"
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 >
hace 2 años
Voxin Muyli
2f15739374
Merge pull request #4065 from django-oscar/dependabot/pip/redis-gte-3.5-and-lt-4.6
Update redis requirement from <4.4,>=3.5 to >=3.5,<4.6
hace 2 años
Viggodevries
56e438ca1d
Revert "fix for #4049 (#4050)"
This reverts commit f3b2d2eb20 .
hace 2 años
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
hace 2 años
mghiglieri
f3b2d2eb20
fix for #4049 (#4050)
* fix for #4049
hace 2 años
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 >
hace 2 años
Voxin Muyli
a77a493214
Merge pull request #4061 from samar-hassan/samar/optimise-user-order-count
[FEAT] Optimize order count calculation in user listing page
hace 2 años
dependabot[bot]
9593f1790e
Update django-debug-toolbar requirement from <3.6,>=2.2 to >=2.2,<4.1
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...4.0.0 )
---
updated-dependencies:
- dependency-name: django-debug-toolbar
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
hace 2 años
Samar Hassan
3daf3dda59
feat :star: reduce db calls by counting offers in voucher listing
hace 2 años
dimka
dc4577e373
fix: Removing unnecessary permissions from static and documentation files (#4067)
hace 2 años
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 .
hace 2 años
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
hace 2 años
dependabot[bot]
a539a23a71
Update redis requirement from <4.4,>=3.5 to >=3.5,<4.6
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.5.1 )
---
updated-dependencies:
- dependency-name: redis
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
hace 2 años
Samar Hassan
7ffff02388
fix :wrench: show address update button only if there exists one (#4044)
hace 2 años
Gunther Waidacher
75ed8827bd
Exclude non-public Products from Offers detail and Range detail view (#4053)
* Non-public Products are shown in Offers
hace 2 años
Samar Hassan
f72a6f9c89
fix :bug: exclude suspended offers in offer listing (#4059)
hace 2 años
Samar Hassan
8543c60c36
chore :recycle: add relevant user record in orders fixture
hace 2 años
Samar Hassan
baa258e730
feat :star: allow sorting users using their order count
hace 2 años
Samar Hassan
e5f88bfe96
feat :star: optimize order count in user listing page
hace 2 años
Samar Hassan
ca1f0d609b
feat :star: reduce db calls in dashboard user detail page (#4051)
hace 2 años
nathanhighbiza
41ffbda8ad
orderlist view added email when there isn't a name (#4009)
hace 2 años
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
hace 2 años
Voxin Muyli
4b9c833a8a
post_save_set_ancestors_are_public should not run when loading fixtures, (#4040)
The fixtures should contain the correct data.
hace 2 años
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 >
hace 2 años
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 >
hace 2 años
Viggodevries
151dc05395
Release 3.2 final LTS
hace 2 años
Viggodevries
40ca677869
Update translations
hace 2 años