Merge branch 'develop' into feature/restapi

2016-12-09 08:35:13 +01:00
parent 5708aebf1e 14e67a07eb
commit 52dcd6b24c
506 changed files with 207 additions and 3059962 deletions
--- a/rowsandall_app/settings.py
+++ b/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 = [
    {