Merge branch 'master' into Develop

# Conflicts: # cps/admin.py # cps/constants.py # cps/static/css/caliBlur.min.css # cps/uploader.py
2020-05-17 16:22:58 +02:00
parent 13994a5f96 742799b4ac
commit 38c28f4358
28 changed files with 9318 additions and 1304 deletions
@@ -178,10 +178,6 @@ def update_view_configuration():
    _config_int("config_authors_max")
    _config_int("config_restricted_column")

-    if config.config_google_drive_watch_changes_response:
-        config.config_google_drive_watch_changes_response = \
-            json.dumps(config.config_google_drive_watch_changes_response)
-
    config.config_default_role = constants.selected_roles(to_save)
    config.config_default_role &= ~constants.ROLE_ANONYMOUS