Merge pull request #706 from awesto/releases/0.11.x

Releases/0.11.x
awesto · Feb 3, 2018 · 8b88154 · 8b88154
2 parents 73dcf63 + a19899a
commit 8b88154
Show file tree

Hide file tree

Showing 30 changed files with 1,680 additions and 783 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -4,6 +4,22 @@
 Changelog for django-SHOP
 =========================
 
+0.11.4
+======
+
+* Fix: Template context error while rendering Order List-View as Visitor.
+* Fix: Money formatter to allow the usage of the thousand separator.
+* Fix: It now is possible to use the ``ProductListView`` as the main CMS landing page.
+* Fix: Template exception if left- or right extension was missing on the ``OrderList``
+  and/or ``OrderDetail`` view.
+* Add option to Catalog List View: It now is possible to redirect automatically onto a lonely
+  product.
+* Add options to override the add-to-cart template when using the appropriate
+  CMS Cascade plugin.
+* Add option to add a list of products to the navigation node serving a catalog list page.
+* Upgrade external dependencies to their latest compatible versions.
+
+
 0.11.3
 ======
 

diff --git a/docs/tutorial/intro.rst b/docs/tutorial/intro.rst
@@ -7,6 +7,9 @@ Tutorial
 This tutorial is aimed at people new to django SHOP but already familiar with Django. If you aren't
 yet, reading their excellent `Django Tutorial`_ is highly recommended.
 
+Since **django-SHOP** relies on many features offered by **django-CMS** and **Django REST Framework**,
+you should familiarize yourself with these apps.
+
 
 Introduction
 ============
@@ -28,7 +31,7 @@ If you have a Docker runtime on your host, an even quicker approach is to
 Prepare the Installation
 ========================
 
-To run the examples shown in this tutorial, you must install **django-shop** from GitHub, since
+To run the examples shown in this tutorial, you must install **django-SHOP** from GitHub, since
 the pip-installable from PyPI only contains the framework, but not the files required for the demos.
 Before proceeding, please make sure virtualenv_ is installed on your system, otherwise you would
 pollute your Python site-packages folder.

diff --git a/example/myshop/locale/de/LC_MESSAGES/django.mo b/example/myshop/locale/de/LC_MESSAGES/django.mo