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

awesto · Feb 2, 2021 · 5b2ec69 · 5b2ec69
2 parents a37afdc + 58ca663
commit 5b2ec69
Show file tree

Hide file tree

Showing 9 changed files with 2,160 additions and 1,737 deletions.
diff --git a/README.md b/README.md
@@ -12,12 +12,6 @@
 
 Here you can find the [full documentation for django-SHOP](https://django-shop.readthedocs.io/en/latest/).
 
-## Version 1.1 has been released!
-
-See below on how to install it using the Cookiecutter template. It now supports up to django-CMS 3.7
-and Django-2.2.
-
-
 ## 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

diff --git a/docs/reference/payment-providers.rst b/docs/reference/payment-providers.rst
@@ -49,9 +49,9 @@ The Purchasing Operation
 
 During checkout, the clients final step is to click onto a button labeled something like "Buy Now".
 This button belongs to an AngularJS controller, provided by the directive ``shop-dialog-proceed``.
-It may look similar to this::
+It may look similar to this:
 
-.. code-block:: html
+.. code-block:: html+django
 
  <button shop-dialog-proceed ng-click="proceedWith('PURCHASE_NOW')" class="btn btn-success">Buy Now</button>
 

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@
  'django_polymorphic',
  'django-post_office',
  'django-cms>=3.7',
- 'djangocms-cascade>=1.3',
+ 'djangocms-cascade>=1.3,<2',
 ]
 
 CLASSIFIERS = [

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