Samir Shah
89ff0b3da4
Fix URL character validation in dashboard PageUpdateForm.
Also fix the max_length on the url field. The underlying model field has
a max_length of 100, so it is invalid to have a larger value here.
DRY out dashboard page update/create views.
Refactor tests - perform tests of form logic directly rather than indirectly through view code.
Fixes #2559 .
8 lat temu
Samir Shah
f7c1ef85e8
Merge pull request #2563 from django-oscar/solarissmoke-patch-1
Exclude analytics receiver race condition exceptions from coverage reports
8 lat temu
Samir Shah
171fabd007
Exclude analytics receiver race condition exceptions from coverage reports
Otherwise we keep getting "unexpected coverage changes" whenever this code triggers in tests.
The underlying issue is that there is a race condition as noted in the comments.
8 lat temu
Samir Shah
0951e733e0
Merge pull request #2560 from django-oscar/pyup-update-django-extensions-1.9.8-to-1.9.9
Update django-extensions to 1.9.9
8 lat temu
pyup-bot
c83af609fa
Update django-extensions from 1.9.8 to 1.9.9
8 lat temu
yn-coder
49dddf3b4d
Add blocks to partials/nav_accounts.html for easier overriding
Fixes #2555 .
8 lat temu
pyup.io bot
5bd8458c81
Update transifex-client from 0.12.5 to 0.13.0 (#2551)
8 lat temu
Frédéric Montet
b1872791b1
Update modelling_your_catalogue.rst (#2552)
8 lat temu
Alexander Gaevsky
2576521e19
Make all product attribute type choices translatable. (#2549)
8 lat temu
Konstantinos Metaxas
61d53298a7
Add template blocks to make it easier to override and tab panes to the dashboard edit views
8 lat temu
Samir Shah
3167ff2478
Merge pull request #2543 from django-oscar/pyup-update-pillow-4.2.1-to-5.0.0
Update pillow to 5.0.0
8 lat temu
Samir Shah
a402c19b29
Merge pull request #2541 from django-oscar/pyup-update-werkzeug-0.13-to-0.14.1
Update werkzeug to 0.14.1
8 lat temu
pyup-bot
a20a67954f
Update pillow from 4.2.1 to 5.0.0
8 lat temu
pyup-bot
da570b2048
Update werkzeug from 0.13 to 0.14.1
8 lat temu
Samir Shah
72612ca32c
Exclude test utils from coverage reports. (#2538)
8 lat temu
Samir Shah
9e35d4c56d
Forward-port release notes for v1.5.1
8 lat temu
Samir Shah
63e20856a1
Fix rendering of options in AdvancedSelect widget for Django > 1.11. (#2533)
Fixes #2526 .
8 lat temu
Samir Shah
9fd4a14b1f
Fix release date in docs for 1.5 release
8 lat temu
Samir Shah
6955a907ae
Merge pull request #2530 from gogobook/master
Upgrade gulp, gulp-sourcemaps in package.json. Rewrite less.js.
8 lat temu
Samir Shah
353d673e44
Merge pull request #2522 from sasha0/feature/hidden-features
Hidden features improvements.
8 lat temu
gogobook
00220454cb
Upgrade gulp, gulp-sourcemaps in package.json. Rewrite less.js. Add .vscode to .gitignore.
8 lat temu
pyup.io bot
6e8ced9f1b
Update pymysql from 0.7.11 to 0.8.0 (#2527)
8 lat temu
Aleksandr Panteleymonov
d8f04d4014
Escape all the special characters in the catalog names (#2528)
If a category has a special character in the name it's impossible to see any products in this category or it's ascenders because this query breaks Solr.
8 lat temu
Alexander Gaevsky
bb24c38be5
Remove `OSCAR_PROMOTION_MERCHANDISING_BLOCK_TYPES` setting, since merchandising block promotions, which used it, were removed for a while. (#2521)
8 lat temu
Lars van de Kerkhof
88cf667dc1
Added hook to allow implementations of strategies that depend on productoptions (#2523)
* Added hook to allow implementations of strategies that depend on productoptions
Currently when I need to implement a price strategy that has price
components that are dependent on product options, a rather large part of the
basket code needs to be copy pasted, the whole of ``add_product``. The hook
added here allows me to only override the hook.
Some use cases are: Pens with engravings, the price of engraving depends on
the number of letters. But a lot more things open up when prices can be
assigned based on product configuration.
8 lat temu
Alexander Gaevsky
4ba9d578bf
Add content wrapper block to the test site templates in order to resemble standard site behaviour during tests.
8 lat temu
Alexander Gaevsky
ed50f8e7fd
Add tests for feature disablement.
8 lat temu
Alexander Gaevsky
8376fd4e25
Move navigation tabs to the separate template to avoid duplication, do not display wishlists URL if this feature is disabled.
8 lat temu
Samir Shah
f60d448c1d
Merge pull request #2519 from django-oscar/pyup-update-pysolr-3.6.0-to-3.7.0
Update pysolr to 3.7.0
8 lat temu
Samir Shah
9b4164b6fe
Merge pull request #2518 from sasha0/issues/2324/partner-permissions
Order line partner permissions.
8 lat temu
Samir Shah
38d94f6381
Merge pull request #2517 from sasha0/issues/1962/price-excl-tax
Deprecate `StockRecord.price_excl_tax` field name.
8 lat temu
pyup-bot
5004b79069
Update pysolr from 3.6.0 to 3.7.0
8 lat temu
Alexander Gaevsky
b55c8bdd46
Move order lines aggregation in dashboard order detail view to the separate method.
This will simplify to filter out order lines, based on partner permission, without rewritting view code. By default, partners see all lines of the order, without respect whether lines were supplied by them or not.
Which may not always be the case, when we need partner to see only own lines.
8 lat temu
Alexander Gaevsky
82489dc87e
Add note to the docs and comment about `StockRecord.price_excl_tax` field renaming in Oscar 2.0.
8 lat temu
Alexander Gaevsky
9febe47522
Merge pull request #2511 from sasha0/feature/docs
Improve documentation for product template customization.
8 lat temu
Alexander Gaevsky
6ea91c690a
Merge pull request #2512 from sasha0/issues/1619/search-form
Allow `SearchHandler.get_search_form` accept keyword argument for the form class.
8 lat temu
Alexander Gaevsky
2f27da2e1e
Merge pull request #2510 from sasha0/feature/2163/offer-proxy
Fix condition/offer proxy class name property validation.
8 lat temu
Alexander Gaevsky
af50038f37
Allow `SearchHandler.get_search_form` accept keyword argument for the form class.
8 lat temu
Alexander Gaevsky
775967dcbe
Improve documentation for product template customization.
8 lat temu
Alexander Gaevsky
cc1c1f9f13
Fix condition/offer proxy class name property validation.
8 lat temu
Alexander Gaevsky
07891907f5
Merge pull request #2513 from sasha0/feature/dependencies
Limit django-tables2 to 1.16 version for now as the last supporting Django 1.8.
8 lat temu
Alexander Gaevsky
3e5d45063e
Limit django-tables2 to 1.16 version for now as the last supporting Django 1.8.
8 lat temu
Samir Shah
074030bd2b
Merge pull request #2507 from sasha0/feature/docs
Add docs for price currencies.
8 lat temu
Alexander Gaevsky
4f29bfc87a
Add docs for price currencies.
8 lat temu
Alexander Gaevsky
2455ba50e5
Merge pull request #2509 from solarissmoke/enhancement/phonenumbermixin
Rename PhoneNumberMixin.phone_numbers_fields to phone_number_fields and add to docs.
8 lat temu
Samir Shah
e5c84703dd
Rename PhoneNumberMixin.phone_numbers_fields to phone_number_fields and add to docs.
phone_number_fields is more correct grammatically.
Add to the dosctring for the class, and display it in the documentation.
8 lat temu
Samir Shah
b51c8579d0
Merge pull request #2504 from sasha0/feature/2163/offer-proxy
Add validation if proxy benefit and condition classes have name property defined.
8 lat temu
Alexander Gaevsky
bcdf8e8201
Fix typos in docs for custom benefit creation.
8 lat temu
Alexander Gaevsky
0c27828e66
Add note about necessity to define name attribute for proxy benefit and condition models to the docs.
8 lat temu
Alexander Gaevsky
7044b462ee
Add validation if proxy benefit and condition classes have name property defined.
8 lat temu