Merge branch 'develop' into feature/opaqueid

2019-02-13 17:14:33 +01:00
parent dd633076f1 82d6b09224
commit f148b8494e
119 changed files with 116778 additions and 10192 deletions
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -34,6 +34,7 @@ SECRET_KEY = CFG['secret_key']

 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
+TESTING = False

 ALLOWED_HOSTS = CFG['allowed_hosts']

@@ -54,7 +55,7 @@ INSTALLED_APPS = [
    'leaflet',
    'django_rq',
    'django_rq_dashboard',
-    'translation_manager',
+#    'translation_manager',
    'django_mailbox',
    'rest_framework',
    'datetimewidget',