edan_f0

David Winterbottom 5351e303aa Merge branch 'master' into issue/764/partner-strategy Conflicts: docs/source/releases/v0.6.rst docs/source/topics/key_questions.rst oscar/apps/basket/forms.py oscar/apps/catalogue/views.py oscar/apps/customer/views.py oscar/templates/oscar/basket/partials/basket_content.html oscar/templates/oscar/basket/partials/basket_quick.html oscar/templates/oscar/catalogue/partials/add_to_basket_form.html oscar/templates/oscar/catalogue/partials/add_to_basket_form_compact.html oscar/templates/oscar/catalogue/partials/product.html oscar/templates/oscar/checkout/checkout.html oscar/templates/oscar/customer/address_delete.html oscar/templates/oscar/customer/address_form.html oscar/templates/oscar/customer/address_list.html oscar/templates/oscar/customer/change_password_form.html oscar/templates/oscar/customer/email.html oscar/templates/oscar/customer/order_list.html oscar/templates/oscar/customer/profile.html oscar/templates/oscar/dashboard/catalogue/product_list.html oscar/templates/oscar/partials/nav_primary.html requirements.txt tests/functional/customer/profile_tests.py tests/integration/order/model_tests.py		12 лет назад
..
logging	Correct flake8 errors and warnings	13 лет назад
__init__.py	Added core and test packages	14 лет назад
ajax.py	Use temporary storage for flash messages	13 лет назад
application.py	Add lightweight feature hiding functionality	12 лет назад
compat.py	Add two settings related to custom user model	12 лет назад
context_processors.py	Use CSS over Less as the default in the sandbox	13 лет назад
decorators.py	Deprecate availability/price methods on StockRecord	12 лет назад
loading.py	Rework how we tell if there is a profile class	12 лет назад
prices.py	Store currency with order	12 лет назад
utils.py	Ensure Oscar always displays timezone-aware datetimes	12 лет назад
validators.py	Split cleaning behaviour into form	12 лет назад