edan_f0

История

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