Samir Shah
74e4f3aa0c
Merge pull request #3061 from sasha0/feature/templates
Update checkout payment detail template: cleanup archived packages, replace with the relevant ones.
6 years ago
Samir Shah
9f22470240
Merge pull request #3062 from rik/restore-voucher-sets-urls
Restore voucher set URLs
6 years ago
Anthony Ricaud
a41e61193f
Restore voucher set URLs
As part of fbf8bac4c5/, the Voucher set URLs disappeared.
The following exception is logged on every Dashboard page:
`Reverse for 'voucher-set-list' not found. 'voucher-set-list' is not a valid view function or pattern name.`
6 years ago
Alexander Gaevsky
b02702473f
Update checkout payment detail template: cleanup archived packages, replace with the relevant ones.
6 years ago
Samir Shah
c4b3a1e119
Merge pull request #3060 from innomatics/patch-2
Doc Fix: Link to stable documents in front README page
6 years ago
Justin Hopkins
5eea90751b
Link to stable documents in front README page
6 years ago
Samir Shah
b0a5498754
Merge pull request #3054 from django-oscar/pyup-update-django-extensions-2.1.7-to-2.1.9
Update django-extensions to 2.1.9
6 years ago
dfirst
3cd865a4c5
Fix handling of missing lines in wishlist views (#3053)
6 years ago
pyup-bot
c393671b14
Update django-extensions from 2.1.7 to 2.1.9
6 years ago
mongkyo
797f9b2e9c
Update signature of get_db_value to avoid deprecated context argument
6 years ago
Samir Shah
1b5c6ba136
Merge pull request #3043 from rik/jquery-cdn-upgrade
Upgrade CDN version of jQuery
6 years ago
Anthony Ricaud
4b00f3f88f
Upgrade CDN version of jQuery
https://github.com/django-oscar/django-oscar/pull/3018 updated the in-tree versions
6 years ago
Samir Shah
fd7e0481a7
Add easy_thumbnails to docs requirements
6 years ago
Samir Shah
7074b0501e
Merge pull request #3042 from django-oscar/solarissmoke-patch-2
Add sorl-thumbnail to docs requirements
6 years ago
Samir Shah
7957a3d65e
Add sorl-thumbnail to docs requirements and fix docs/requirements.txt
6 years ago
Samir Shah
6fa2834df0
Merge pull request #3031 from django-oscar/pyup-update-isort-4.3.18-to-4.3.20
Update isort to 4.3.20
6 years ago
Samir Shah
59929f881a
Merge pull request #3039 from django-oscar/pyup-update-django-extensions-2.1.6-to-2.1.7
Update django-extensions to 2.1.7
6 years ago
Samir Shah
19c139d7ac
Merge pull request #3032 from django-oscar/pyup-update-werkzeug-0.15.2-to-0.15.4
Update werkzeug to 0.15.4
6 years ago
Samir Shah
52f50ba736
Merge pull request #3036 from django-oscar/pyup-update-requests-2.21.0-to-2.22.0
Update requests to 2.22.0
6 years ago
Samir Shah
dae05f5302
Merge pull request #3034 from shimulch/issue/3033/dashboard_less
Add less.js to Dashboard Layout
6 years ago
Samir Shah
743e7489cf
Merge branch 'master' into issue/3033/dashboard_less
6 years ago
Lars van de Kerkhof
0f2c6bf2c8
Retrieving product options now performs only 1 query. (#3037)
* Retrieving product options now performs only 1 query.
Also it returns all the product options combined. This makes more sense because
as the existing tests prove, there is already a way to retrieve the product_class
options and the product options separately.
6 years ago
Samir Shah
f1ea815ae9
Merge branch 'master' into issue/3033/dashboard_less
6 years ago
pyup-bot
bdc5cc249c
Update django-extensions from 2.1.6 to 2.1.7
6 years ago
pyup-bot
f4aa547b0d
Update requests from 2.21.0 to 2.22.0
6 years ago
Samir Shah
7ad22c3b3b
Merge pull request #3028 from solarissmoke/update-translatable-strings
Update translatable strings
6 years ago
Alexander Gaevsky
1f59050d81
Merge branch 'master' into update-translatable-strings
6 years ago
Samir Shah
e1afd6292f
Drop transifex push from travis build
6 years ago
Samir Shah
183846c934
Use --no-wrap for makemessages, for consistency with existing messages.
6 years ago
Samir Shah
6a25089864
Update translatable strings.
6 years ago
Shimul Chowdhury
2cde4744c1
less.js updated to version 3.9.0
6 years ago
Shimul Chowdhury
1bf0cf2248
Add less.js to Dashboard Layout
OSCAR_USE_LESS = True doesn't work in Oscar Dashboard. This commit makes it work by putting less.js on dashboard/layout.html
6 years ago
pyup-bot
8b85253968
Update werkzeug from 0.15.2 to 0.15.4
6 years ago
pyup-bot
d8aa7a6757
Update isort from 4.3.18 to 4.3.20
6 years ago
Samir Shah
47dc4168f8
Update transifex-client used in CI build
The version we are currently using is out of date, and the Transifex API
has changed to use API keys instead of username and password.
6 years ago
Samir Shah
60c1241e75
Merge pull request #3021 from django-oscar/feature/prepare-20b1
Prepare for 2.0b1 release
6 years ago
Samir Shah
27bb165704
Merge pull request #3022 from django-oscar/fix/2_0_release_notes
Improve release notes and change deprecation warnings
6 years ago
Samir Shah
1582a93ada
Prepare for 2.0b1 release
6 years ago
Craig Loftus
91020f055b
Improve release notes and change deprecation warnings
6 years ago
Samir Shah
31e9478bfc
Merge pull request #3020 from django-oscar/feature/update-translations
Update translations from transifex.
6 years ago
Samir Shah
d0b1aee45b
Update translations from transifex.
6 years ago
Samir Shah
2f46e682e4
Merge pull request #3017 from solarissmoke/feature/drop-django20
Drop Django 2.0 from test matrix and update supported versions in several places
6 years ago
Samir Shah
879b309f99
Drop Django 2.0 from test matrix and update supported versions in several places
Django 2.0 reached end of life in April 2019.
6 years ago
Samir Shah
b4411339bc
Update jQuery to version 3.4.1
6 years ago
Samir Shah
0cc99f3bc3
Merge pull request #3000 from sasha0/feature/templates
Remove `OSCAR_MAIN_TEMPLATE_DIR` setting.
6 years ago
Alexander Gaevsky
e7fc4b9475
Rework paragraph about template settings in getting started documentation.
6 years ago
Alexander Gaevsky
8e3be1d748
Explicitly set request error handlers in the test site URLconf.
6 years ago
Alexander Gaevsky
c90ccd56da
Move test site templates to the `oscar` subfolder.
6 years ago
Alexander Gaevsky
04a8e3b465
Remove hacky setting `OSCAR_MAIN_TEMPLATE_DIR` completely.
6 years ago
Alexander Gaevsky
a75d6ee819
Specify full path to Oscar templates, including `oscar` prefix.
6 years ago