Correct multivalued setting for category in Solr schema
Remove unused views
Merge pull request #1220 from grakic/patch-3

Remove unused views
Only check quantity permissions if > 0

This allows removal of products in the basket if they are not in stock
by setting the quantity to 0
Add tests for BasketLineForm
Merge pull request #1222
Use SimpleLazyObject for request.basket

This is a major performance improvement for pages where the basket is 
not used (other pages or loading basket async via javascript).

Note that request.basket is now not available when calling 
`apply_offers_to_basket`. Note sure why this is required since the 
basket is passed along.
Fix unittests by checking if request.basket is a SimpleLazyObject
Small stylefix in BasketMiddleware.process_response

We already checked if request has the 'basket' attribute, no need to check it twice
Moved description of what is required of MIDDLEWARE_CLASSES into a single location in the document for easier reference. It appears that BasketMiddleware is easy to miss. I missed it and someone else on the mailing list had the same error.
Merge pull request #1224 from Kulak/master

Consolidated MIDDLEWARE_CLASSES settings
Allow users to specify card types

Fix to allow users to specify which cards they accept.
By default, this works exactly as it did- i.e., any number
can be entered and only a luhn check is run on it.
Users can now overide this behaviour by passing a list of
accepted cards as a 'types'kwarg to BankcardNumberField,
e.g.
BankcardNumberField(types=[bankcards.VISA, bankcards.VISA_ELECTRON,])

If this is specified, we check that the type of card is one we're
aware of and then that the card number matches the pattern for that
type of card

Fixes #949

@maikhoepfel rewrote the ImproperlyConfigured check using Python's sets.

Conflicts:
	oscar/apps/payment/forms.py
Update release notes, two minor style fixes
Merge branch 'LUKKIEN-lazy-load-basket'
When affixing nav errors, skip empty error blocks

ef3ccf08a707ae1250cdb8d5f2dc6f721d020dc4 introduced a new error block
class. dashboard.js' logic to affix the little red exclamation marks in
the ProductUpdateCreateView then assumed that the forms are full of
errors, even if the error block is empty. Hence empty error blocks are
excluded now.

Also fixed a regression introduced with that commit showing the category
summary.
Use Django form to handle product class dropdown in dashboard

Selecting the product class of the product to create used to be done via
hard-coded HTML and no form validation. It is now done The Django
Way(tm).

It also pre-selects the product class if there's only one.

Fixes #838
Make some messages translatable
Merge pull request #1227 from itbabu/make-some-warnings-translatable

Make some messages translatable
Fix tests for product class dropdown changes

On my local machine, django-dynamic-fixture created product classes
where the slug and primary key were identical and the tests passed
although the check was wrong. Luckily, Murphy's Law works in our favour
on Travis CI, and that failed and spotted it.

This commit fixes the assumption that the redirect view expects the slug
(which it doesn't since the last commit), and ensures that the generated
product classes are non-numeric.
Introduce django-extensions' AutoSluField

A lot of Oscar's models have slugs that are populated from other fields
in the respective save() methods.
But currently there's no logic to check for duplicate slugs.
AutoSlugField does both the population and ensures uniqueness.