Fix PEP8 and deprecation issues
Use unambiguous label for changing promotion display order

Re: https://groups.google.com/d/msgid/django-oscar/d7617232-2a19-4348-b148-f909700325bd%40googlegroups.com
Fix a small typo
Merge pull request #1381 from monokrome/patch-1

Fix a small typo
Turn AbstractAddress.search_text into a TextField

@hkage raised a good point in #1384
that concatenating the address lines might lead to
a string that's longer than the set limit of 1000 characters. If I
recall correctly, a CharField limit much higher than 255 characters is
troublesome with some databases anyway, so I've taken the opportunity to
turn it into a TextField instead.

Fixes #1384.
Fixes #1385.
Dashboard search: Fallback to __icontains search for UPC

On Bike Parts Market, UPCs are structured in a way that allows grouping
of products by UPC. In that case, an icontains search on UPC becomes
useful.

This commit introduces a change that if the UPC exacht search doesn't
match, it falls back to an icontains search, potentially showing more
than one match. This mirrors what the title search does already.
Refactor product attribute tests

They were in a bit of state, and are now using factories. Still far from
ideal, but I'd rather not change them too much while refactoring
attributes at the same time.
Refactor product attribute validation

* The get_validator method was dropped. Elsewhere we use the explicit
  lookup by type, so why not there? It only makes adding custom
  validation for e.g. richt text values more verbose, as both adding a
  validation method and overriding get_validator is needed.
  get_validator() was not used elsewhere in the codebase.
* The unused is_value_valid (used for option values) has been dropped.
  The same check is already done in _validate_option.
Rebuild product attribute entities

Product attributes had a mechanism to point at related model instances
in a generic way, but nobody managed to understand or get it working.
This comment removes that logic, including the AttributeEntity and
AttributeEntityType models.

Instead, this commit models the relation via a generic foreign key on
ProductAttributeValue.

I don't think there's a good default behaviour for the entity selection
as presumably each deployment will want to limit the selection in some
way. Therefore, there's currently no frontend support for it.

variants.json has been rebuilt by executing the migration and dumping
the correct data afterwards. That explains the other changes in it, as
usually we'd just use vim line matching to shape it into a form that
lets us build the sandbox.
Update demo site fixtures

I forgot to update the demo site fixtures, which caused Travis to fail.
Thank you Travis.
Include location helper in docs, and use it more in settings

Two people on the mailing list tripped over the location helper, so it's
now included right next to where it is used.

The helper is now also used in a few more spots in the settings.
Turn ProductAttributeValue.value_text into a TextField

A 255 character limit seems somewhat arbitrary. And if there's
performance issues, using product attributes probably isn't the right
approach anyway.

This commit replaces the migration to decrease clutter.

Fixes #1380.
Add forgotten migration to release notes
Add documentation on modelling the catalogue

This includes two examples for product attributes.

Also fixes two "document not referenced" warnings.

Fixes #794.
Merge branch 'issue/794/attributeentities'

Conflicts:
	docs/source/releases/v0.8.rst
Remove custom sorl key-value store

As far as I can tell, it was added to circumvent a problem in Sorl. The
problem was fixed in
https://github.com/mariocesar/sorl-thumbnail/pull/167, and we use a
released version that contains the fix.

I also don't see it being used anywhere. So it seems safe to delete it.
Allow disabling deletion of image files and thumbnails

Oscar by default deleted image files and thumbnails. That is usually
fine, but has been an issue when using remote storages like S3. This
change also makes the only remaining import from sorl optional, hence
paving the way to making it completely optional.

Fixes #1373.
Drop setting for custom Sorl KV store

When I removed the custom KV store in
8d73c0231428acf16da3f5a187154ea73d5fe7ef, I mistakenly only searched for
usages within the oscar/ directory, and missed that it's still specified
in the sandbox settings.

This is now fixed. Was reported on the mailing list:
https://groups.google.com/d/msgid/django-oscar/042d2f5d-e14e-4431-9dbc-286d3215b3da%40googlegroups.com?utm_medium=email&utm_source=footer
added -? to regex in urls to allow for anonymous users to show up and not raise an error from the dashboard/users/index.html template.
Simplify purchase_info tags

by taking advantage of the template tag helper functions.

https://docs.djangoproject.com/en/1.4/releases/1.4/#assignment-template-tags