edan_f0

David Winterbottom 9e4258098f Merge branch 'master' into issue/764/partner-strategy Conflicts: oscar/models/fields.py oscar/templates/oscar/basket/partials/basket_content.html oscar/templates/oscar/dashboard/catalogue/product_list.html oscar/templates/oscar/partials/form_field.html oscar/test/factories.py		12 лет назад
..
alerts	All functional tests pass! Boom!	12 лет назад
migrations	Updated dependencies for south migrations	12 лет назад
notifications	Update context_processors.py	13 лет назад
__init__.py	Refactored folder structure to use an 'apps' folder	15 лет назад
abstract_models.py	Remove '\r' from email message subjects	12 лет назад
admin.py	Tidy-up of a few modules	13 лет назад
app.py	Major rewrite of stock alerts	13 лет назад
auth_backends.py	Ensure email is always cleaned before authentication test	12 лет назад
forms.py	Fix partner user form regression	12 лет назад
history_helpers.py	Clean up some minor issue with JSON	13 лет назад
managers.py	Rework email sending framework to be clearer	13 лет назад
models.py	Major rewrite of stock alerts	13 лет назад
signals.py	add 'user_registered' signal	13 лет назад
utils.py	Standardise email address handling	12 лет назад
views.py	All functional tests pass! Boom!	12 лет назад