edan_f0

Maik Hoepfel 7495405bb6 Merge branch 'master' into feature/variants_dashboard This mostly pulls in the tables2 work. I opted to just use master's branch product_list template, and will add the variants column that I added as part of #1441 as a tables2 column. Conflicts: oscar/apps/catalogue/abstract_models.py oscar/apps/dashboard/catalogue/views.py oscar/templates/oscar/dashboard/catalogue/product_list.html		11 роки тому
..
__init__.py	Move django-oscar-testsupport into oscar.test	12 роки тому
basket.py	hasattr changed in Python3.	12 роки тому
contextmanagers.py	assertEquals deprecated in favor of assertEqual	12 роки тому
decorators.py	pylint fixes	11 роки тому
factories.py	Ensure consecutive display order of images	11 роки тому
newfactories.py	Merge branch 'master' into feature/variants_dashboard	11 роки тому
testcases.py	Remove dependency on six library	11 роки тому