Prepare for release 1.1.4

django-oscar · Jul 4, 2017 · f86538d · f86538d
1 parent 2a137b3
commit f86538d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -2,6 +2,16 @@
 Changelog
 =========
 
+1.1.4 (2017-07-04)
+-------------------
+Features:
+  * #102 Let the ProductAttribute and ProductAttributeValue serializer fields be overridable by settings (yazanhorani)
+  * #101 Don't delete anonymous basket which are merged after login, leave them in the database with the status `MERGED` (aleksandrpanteleymonov)
+
+Notes:
+  Before this release, anonymous baskets where merged in the `LoginView` and after being merged, deleted. This behaviour is now removed, so anonymous baskets remain in the database and have the status MERGED (This is more in the direction of how Oscar is working). You can change this behaviour by overriding the `merge_baskets` method / hook in the `LoginView`, or you should add a cron job to cleanup old baskets with the status MERGED from the database.
+
+
 1.1.3 (2017-05-23)
 -------------------
 Features:

diff --git a/docs/source/usage/settings.rst b/docs/source/usage/settings.rst
@@ -69,5 +69,6 @@ Product serializers
 .. autoclass:: oscarapi.serializers.product.ProductLinkSerializer
 .. autoclass:: oscarapi.serializers.product.RecommmendedProductSerializer
 .. autoclass:: oscarapi.serializers.product.ProductSerializer
-
+.. autoclass:: oscarapi.serializers.product.ProductAttributeSerializer
+.. autoclass:: oscarapi.serializers.product.ProductAttributeValueSerializer
 
diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-__version__ = "1.1.3"
+__version__ = "1.1.4"
 
 
 setup(