Merge branch 'master' into nanterre-recette

setup.py

@@ -97,7 +97,7 @@ setup(
         'Programming Language :: Python :: 2',
     ],
     install_requires=[
-        'django>=1.10',
+        'django>=1.10,<2',
         'isodate',
         'psycopg2',
         'jsonschema',

zoo/settings.py

@@ -167,6 +167,11 @@ LOGGING = {
         }
     },
     'loggers': {
+        'requests': {
+            'level': 'CRITICAL',
+            'handlers': ['console', 'mail_admins'],
+            'propagate': False,
+        },
         'django.db': {
             'level': 'INFO',
             'handlers': ['console'],

zoo/zoo_data/admin.py

@@ -59,7 +59,7 @@ class RightRelationInlineAdmin(JSONEditorMixin, admin.TabularInline):
 
 class LogInlineAdmin(JSONEditorMixin, admin.TabularInline):
     model = Log
-    fields = ['timestamp', 'transaction', 'content', 'url']
+    fields = ['timestamp', 'transaction', 'content']
     readonly_fields = ['timestamp', 'transaction']
     extra = 0
     can_delete = False