David Winterbottom
bc4d54f2ec
Add docs target to makefile
13 years ago
David Winterbottom
ca73313ac4
Merge pull request #531
13 years ago
David Winterbottom
d4bdd320dc
Extend recipe on customising a core class
Building on the work of @ArtS
13 years ago
David Winterbottom
440733ca37
Add simple offer homepage
13 years ago
David Winterbottom
be38a12e86
Remove unnecessary product class check from stock wrapper
This check now happens in the product itself to avoid the extra SQL
queries involved.
13 years ago
David Winterbottom
954b348f1e
Bump version of oscar_testsupport to fix voucher issue
13 years ago
David Winterbottom
6d902eb4de
Reduce SQL queries per page
A liberal application of `select_related` and `prefetch_related` is a
useful thing.
13 years ago
David Winterbottom
ab6b24c7fa
Merge pull request #546 from tangentlabs/issue/546/less-node-css
Installation issues with virtual-node and virtual-less
13 years ago
David Winterbottom
f91a841e0e
Merge pull request #595 from tangentlabs/issue/595/offer-discounts
Alter how absolute discounts are applied
13 years ago
Sebastian Vetter
dd454ddf03
Fix broken init in ui.js
After ``oscar.catalogue`` from ``ui.js`` in
768311780b its init statement was
not removed causing the JS to fail.
13 years ago
David Winterbottom
a2eb319c07
Alter how absolute discounts are applied
This change applies the discount to all matching lines in the benefit
range, weighting the discount by the line prices. The old way was to
iterate over each line and try and apply all the discount.
This new way means that applying an absolute benefit consumes more
products from the basket than the old way, which may possibly have some
confusing side-effects.
This change avoids an issue where customers can get a free product if
they return most of the ordered products apart from the one that was
discounted to zero.
13 years ago
David Winterbottom
345837f819
Compile CSS before packaging in release script
13 years ago
David Winterbottom
da10ac0cba
Update docs with how to develop CSS/LESS
13 years ago
David Winterbottom
5642461b61
Use CSS over Less as the default in the sandbox
You only want to compile Less files if you are developing the CSS of
Oscar. Most people don't do this and so we default to serving
compressed CSS without Less compilation. This also means that
the many contributors don't need to bother installing node.js and lessc,
which makes the installation process much simpler.
This change also re-introduces the `USE_LESS` setting which controls
whether Less files are used or not.
13 years ago
David Winterbottom
ffc26da2ad
Migrate virtual-* dependencies to requirements file
They are only really required if you are developing Oscar's CSS files -
they are not a real dependency of Oscar.
13 years ago
David Winterbottom
31e91e8d9f
Add a few comments around communication events
13 years ago
David Winterbottom
2af9f2561c
Correct slugify usage
Not quite sure how it regressed in the catalogue app. Git blame does
not help sadly.
13 years ago
David Winterbottom
34e71b7abd
Add compiled message files
13 years ago
David Winterbottom
32e370ffa2
Update messages files
13 years ago
Dawid Lorenz
d5ec33bbba
Improve Polish translations
From #591
13 years ago
Dawid Lorenz
f06c32a56d
Patch missing translation blocks
From #591
13 years ago
David Winterbottom
bc910e02ee
Correct payment error message
13 years ago
David Winterbottom
b089181e9b
Merge pull request #560 from tangentlabs/feature/language_switcher
Add language switcher to main navigation
13 years ago
David Winterbottom
5ee6c85071
Rework markup for language selector
Use dropdown in the top nav. This still needs some FED attention as it
doesn't render quite right atm.
13 years ago
David Winterbottom
9a842695a0
Adjust sandbox language settings
* Use en-gb as default
* Correct order of middleware
13 years ago
David Winterbottom
c61f00df4f
Merge (some of) pull request #508
Conflicts:
oscar/templates/oscar/dashboard/orders/order_detail.html
13 years ago
David Winterbottom
c6d6a8fe9e
Adjust layout of payment transactions
* Add defaults
* Put source name as a normal column
13 years ago
David Winterbottom
3590865a46
Correct order dashboard template
Mark-up was wonky.
13 years ago
David Winterbottom
b91b9e892b
Ensure testing deps don't clobber package ones
Installing the requirements.txt after running 'setup.py develop' can
cause problems as it doesn't respect the version ranges from setup.py.
This was picked up by Hudson which was installing Django==1.5 when
upgrading django-nose.
This is addresses by:
* Adding Django to requirements.txt
* Running 'setup.py develop' AFTER installing requirements.txt
13 years ago
David Winterbottom
704cdba191
Merge pull request #589 from zoyalab/polish-translation
Improve many translated strings across Polish language file
13 years ago
David Winterbottom
433fb14b7d
Merge branch 'master' of github.com:tangentlabs/django-oscar
13 years ago
Dawid Lorenz
8c530ac3ad
Improve many translated strings across Polish language file
Conflicts:
oscar/locale/pl/LC_MESSAGES/django.po
13 years ago
David Winterbottom
1296b1f0b2
Correct data migration for updating product ratings
13 years ago
David Winterbottom
768311780b
Merge pull request #420
Conflicts:
oscar/apps/catalogue/abstract_models.py
13 years ago
David Winterbottom
334e794be7
Fix bug in management command for updating ratings
13 years ago
David Winterbottom
08806fd0a1
Move update_product_rating onto Product model
It seems to belong conceptually there, rather than on the ProductReview
model.
13 years ago
David Winterbottom
7d74296021
Move management command to conventional location
13 years ago
David Winterbottom
d02edba8fc
Remove superfluous view
Plus some light tidying of the views module
13 years ago
David Winterbottom
f0f9f8dbdc
Rename review templates
Bring names inline with normal django conventions.
13 years ago
David Winterbottom
3dfed1990f
Rework review templates
* Extract out the review snippet into its own partial.
* Bring the review detail inline with the review list template.
13 years ago
David Winterbottom
d3f0157b08
Correct URL regex for reviews
Had fallen out of sync with the core product URLs as it still used a
hyphen instead of an underscore.
13 years ago
David Winterbottom
431a2bf5fd
Tidy-up and document templates
Some commenting and indenting added.
13 years ago
aibon
be80ac1c0a
Fix pagination in Haystack search
Haystack's SearchView isn't based on django CBV and uses 'page' instead
of 'page_obj' in context. Simple fix was to duplicate pagination.html
and use that version for the search view.
13 years ago
Maik Hoepfel
2164351d6b
Docs: Rename docs on creating benefits
/howto/index.rst was pointing at the wrong file. Renamed the file to
maintain naming consistency.
13 years ago
Maik Hoepfel
70d06212c8
Docs: remove boilerplate project section
Yet another project is hard to maintain, and it's mainly used for
internal use. Removing it reduces the number of options of how to get a
Oscar project running, hence making it easier.
13 years ago
Maik Hoepfel
40256c4dd3
Add {% block %} on order_detail.html
Allows for easier overriding when changing what gets displayed.
13 years ago
David Winterbottom
b9a37e99f5
Don't allow nose-progressive==1.4
It conflicts with the nose restriction required to get the spec plugin
working.
13 years ago
Maik Hoepfel
d8312bf183
Merge pull request #570 from mgmtech/issue/554/pickling-productattr-infiniteloop
Resolve pickle error for ProductAttributesContainer
13 years ago
David Winterbottom
63c148c858
Rename offer migration to avoid merge issues
The merged branch had a migration with number 0017 which clashed with an
existing one. This commit renames the migration so it is applied
correctly in order and picks up the changes from the preceding
migrations.
13 years ago
Dawid Lorenz
8b94d8f5d0
Add link to the Transifex project to README
Fix #581
13 years ago