edan_f0

Verlauf

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		vor 14 Jahren
..
components	Added some better docs for offers and vouchers	vor 15 Jahren
contributing	Removed coverage command from run_tests, and updated docs for installation	vor 15 Jahren
getting_started	Merge branch 'master' into search	vor 15 Jahren
recipes	Major tidy up of checkout view classes.	vor 15 Jahren
reference	Merge branch 'search' of https://github.com/a-musing-moose/django-oscar into search	vor 15 Jahren
web_services	Major tidy up of checkout view classes.	vor 15 Jahren
components.rst	Added some better docs for offers and vouchers	vor 15 Jahren
conf.py	Updated documentation to talk about checkout	vor 15 Jahren
contributing.rst	Updated documentation	vor 14 Jahren
ecommerce_domain.rst	Updated docs for ecommerce modelling	vor 15 Jahren
getting_started.rst	adding documentation on solr setup	vor 15 Jahren
index.rst	Updated documentation	vor 14 Jahren
introduction.rst	Updated basket and offer models to support "consumption"	vor 15 Jahren
logging.rst	Added basic logging support to checkout	vor 15 Jahren
recipes.rst	Updated documentation to talk about checkout	vor 15 Jahren
reference.rst	adding documentation on oscar settings and changing BASKET_COOKIE_LIFETIME to OSCAR_BASKET_COOKIE_LIFETIME for consistency	vor 15 Jahren
web_services.rst	Major tidy up of checkout view classes.	vor 15 Jahren