Merged 0.6

.hgtags

@@ -74,3 +74,4 @@ d6a3c0f3de9d1f09891af9b1c2e817f3cc17a3a8 0.6.9
 0000000000000000000000000000000000000000 0.6.11
 0000000000000000000000000000000000000000 0.6.11
 fa82a5c54664f503af1798c16814471ced09ab08 0.6.11
+a83ce68b7ddcc44695c16abb07e34e2b5b26f0d1 0.6.12

HISTORY.txt

@@ -1,6 +1,36 @@
 HISTORY
 =======
 
+0.6.12 (2012-03-31)
+-------------------
+
+* Bugfix: fixed local variable 'message' referenced before assignment (Maciej Wiśniowski)
+* Bugfix: fixed CreditCard's __unicode__ method; issue #172
+* Bugfix: added safe filter to static block; issue #174
+
+0.6.11 (2012-03-24)
+-------------------
+
+* Bugfix: added csrf token to password reset forms; issue #170
+* Bugfix: removed double slash from logo URLs; issue #166
+* Updated German translations
+
+0.6.10 (2012-03-17)
+-------------------
+
+* Using django-postal 0.9
+* Bugfix: don't display non-active products within cart nor add them to order with checkout; adapt tests; fixed issue #154.
+* Bugfix: don't delete OrderItems when a product is deleted.
+
+0.6.9 (2012-03-08)
+------------------
+
+* Security fix
+* Added manufacturer field to product management (Maciej Wiśniowski)
+* Bugfix: fixed pagination for product page; issue #152 (Maciej Wiśniowski)
+* Bugfix: fixed deleting of image for payment and shipping methods; issue #150
+* Bugfix: fixed markup; #issue #148
+
 0.6.8 (2012-03-03)
 ------------------
 
@@ -146,6 +176,11 @@ HISTORY
 * Using Python's locale to display currencies
 * New contact form
 
+0.5.1 (2012-03-30)
+------------------
+
+* Bugfix: fixed upload of images and files.
+
 0.5.0 (2012-03-08)
 ------------------
 

README.txt

@@ -24,15 +24,11 @@ A demo shop can be tried here:
 
 * http://demo.getlfs.com
 
-The latest development state can be found here:
-
-* http://dev.getlfs.com
-
 Changes
 =======
 
-Unreleased
-----------
+0.6.12 (2012-03-31)
+-------------------
 
 * Bugfix: added safe filter to static block; issue #174 (Frank Feng)
 * Bugfix: Fixed display of short description for variants

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '0.7.0b5'
+version = '0.7.0b6'
 
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, 'README.txt')).read()
@@ -29,7 +29,7 @@
       install_requires=[
         'setuptools',
         'django-compressor == 1.1.1',
-        'django-lfstheme == 0.7.0b5',
+        'django-lfstheme == 0.7.0b6',
         'django-pagination == 1.0.7',
         'django-paypal == 0.1.2',
         'django-portlets == 1.1.1',