edan_f0

Historik

David Winterbottom 130770f647 Merge branch 'master' into search Had to add "apps" to many of the import paths within the search module Conflicts: examples/vanilla/settings.py oscar/apps/promotions/views.py oscar/tests.py oscar/urls.py requirements-dev.txt		14 år sedan
..
components	Added some better docs for offers and vouchers	14 år sedan
contributing	Removed coverage command from run_tests, and updated docs for installation	14 år sedan
getting_started	Merge branch 'master' into search	14 år sedan
recipes	Major tidy up of checkout view classes.	14 år sedan
reference	Merge branch 'search' of https://github.com/a-musing-moose/django-oscar into search	14 år sedan
web_services	Major tidy up of checkout view classes.	14 år sedan
components.rst	Added some better docs for offers and vouchers	14 år sedan
conf.py	Updated documentation to talk about checkout	14 år sedan
contributing.rst	Updated documentation	14 år sedan
ecommerce_domain.rst	Updated docs for ecommerce modelling	14 år sedan
getting_started.rst	adding documentation on solr setup	14 år sedan
index.rst	Updated documentation	14 år sedan
introduction.rst	Updated basket and offer models to support "consumption"	14 år sedan
logging.rst	Added basic logging support to checkout	14 år sedan
recipes.rst	Updated documentation to talk about checkout	14 år sedan
reference.rst	adding documentation on oscar settings and changing BASKET_COOKIE_LIFETIME to OSCAR_BASKET_COOKIE_LIFETIME for consistency	14 år sedan
web_services.rst	Major tidy up of checkout view classes.	14 år sedan