Merge branch 'master' of github.com:awesto/django-shop

README.md

@@ -6,13 +6,15 @@
 [![Software license](https://img.shields.io/pypi/l/django-shop.svg)](https://pypi.python.org/pypi/django-shop)
 [![Twitter Follow](https://img.shields.io/twitter/follow/djangoSHOP.svg?style=social&label=djangoSHOP)](https://twitter.com/djangoSHOP)
 
-
-**Release 1.0 has been released!**
-
 **Django-SHOP** aims to be a the easy, fun and fast e-commerce counterpart to
 [django-CMS](https://www.django-cms.org/).
 
 
+## Version 1.1 is about to be released soon!
+
+See below on how to install it using the Cookiecutter template.
+
+
 ## Build the database model out of the product's properties – not vice versa
 
 Most e-commerce systems are shipped with a predefined database model for products. But products can
@@ -97,6 +99,9 @@ If you want to start with a fresh demo, please use the prepared
 [Cookiecutter template for django-SHOP](https://github.com/awesto/cookiecutter-django-shop)
 and follow the instructions. 
 
+To get a first impression of the upcoming release 1.1, please use this
+[Cookiecutter template for django-SHOP version 1.1](https://github.com/awesto/cookiecutter-django-shop/tree/releases/1.1)
+
 
 ## Audience of django-SHOP users
 

docs/changelog.rst

@@ -16,6 +16,8 @@ Changelog for django-SHOP
 
 * Fix error in admin interface for ``Notification``detail view.
 * Refactor all internal model checks to use classmethod ``check()`` provided by Django.
+* Changed the field type of ``quantity`` in :class:`shop.models.defaults.cart_item.CartItem` and
+  :class:`shop.models.defaults.order_item.OrderItem` from ``IntegerField`` to ``PositiveIntegerField``.
 
 
 1.0