Merge branch 'develop' into feature/restapi

rowsandall_app/rows.py

@@ -1,4 +1,7 @@
 import time
+import gzip
+import shutil
+
 from django.core.exceptions import ValidationError
 
 def format_pace_tick(x,pos=None):
@@ -65,7 +68,7 @@ def handle_uploaded_file(f):
     with open(fname2,'wb+') as destination:
 	for chunk in f.chunks():
 	    destination.write(chunk)
-
+            
     return fname,fname2
 
 # this might work on windows

rowsandall_app/settings.py

@@ -61,7 +61,7 @@ AUTHENTICATION_BACKENDS = (
 
 MIDDLEWARE_CLASSES = [
     'django.middleware.gzip.GZipMiddleware',
-    'htmlmin.middleware.HtmlMinifyMiddleware',
+#    'htmlmin.middleware.HtmlMinifyMiddleware',
     'htmlmin.middleware.MarkRequestMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.middleware.security.SecurityMiddleware',
@@ -78,6 +78,13 @@ MIDDLEWARE_CLASSES = [
 ]
 
 ROOT_URLCONF = 'rowsandall_app.urls'
+#HTML_MINIFY = True
+
+#EXCLUDE_FROM_MINIFYING = ('^rowers/flexall',
+#                          '^rowers/list-workouts',
+#                          '^rowers/list-graphs',
+#                          '^admin/',
+#                          '^rowers/histo')
 
 TEMPLATES = [
     {