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 лет назад
..
address	Rework how addresses are cleaned	12 лет назад
basket	Basket tests house-keeping	12 лет назад
catalogue	Revert review form API to be more explicit	12 лет назад
checkout	Store currency with order	12 лет назад
core	Rework ExtendedURLValidator and tests	12 лет назад
customer	Test new line is removed from the message subject	12 лет назад
dashboard	Disallow selecting child products as parent	12 лет назад
forms	Adjust test generator to make tests pass	12 лет назад
offer	Assign strategy classes to baskets	12 лет назад
partner	Ignore expected deprecation warnings in test run	12 лет назад
payment	Use '' as default instead of None in payment methods	12 лет назад
shipping	Support shipping methods when tax isn't known	12 лет назад
voucher	Support Django's 1.5 AUTH_USER_MODEL feature	12 лет назад
__init__.py	Moved tests into separate package.	13 лет назад
logging_tests.py	Use nose test generators instead of @dataProviders	12 лет назад
promotion_tests.py	Moved tests into separate package.	13 лет назад
settings_tests.py	Moved Oscar's templates into a new folder.	13 лет назад
utils_tests.py	Add compose function for combining decorators	12 лет назад
wishlist_tests.py	Use compatability layer for user in test	12 лет назад