Merge branch 'develop' into feature/annotation

app/apps/core/static/js/panels/segmentation.js

@@ -35,6 +35,7 @@ class Box {
             cursor: "grab",
             stop: $.proxy(function(ev) {
                 this.changed = true;
+                this.save();
             }, this),
             // this is necessary because WheelZoom make it jquery-ui drag jump around
             start: $.proxy(function(ev) {
@@ -67,6 +68,7 @@ class Box {
             // disabled: true,
             stop: $.proxy(function(ev) {
                 this.changed = true;
+                this.save();
             }, this),
             start: $.proxy(function(ev) {
                 this.click.x = ev.clientX;

app/escriptorium/local_settings.py

-from escriptorium.settings import *
-
-DEBUG=True
-
-DATABASES = {
-    'default': {
-        'ENGINE': os.getenv('SQL_ENGINE', 'django.db.backends.postgresql'),
-        'NAME': os.getenv('SQL_DATABASE', 'escriptorium'),
-    }
-}
-
-INSTALLED_APPS += ['debug_toolbar', 'django_extensions']
-MIDDLEWARE += ['debug_toolbar.middleware.DebugToolbarMiddleware',]
-INTERNAL_IPS = ['127.0.0.1',]
-
-# only needed in developement
-EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
-EMAIL_FILE_PATH = '/tmp/django-emails'
-
-DEBUG_TOOLBAR_PANELS = [
-    'debug_toolbar.panels.versions.VersionsPanel',
-    'debug_toolbar.panels.timer.TimerPanel',
-    'debug_toolbar.panels.settings.SettingsPanel',
-    'debug_toolbar.panels.headers.HeadersPanel',
-    'debug_toolbar.panels.request.RequestPanel',
-    'debug_toolbar.panels.sql.SQLPanel',
-#    'debug_toolbar.panels.staticfiles.StaticFilesPanel',
-    'debug_toolbar.panels.templates.TemplatesPanel',
-    'debug_toolbar.panels.cache.CachePanel',
-    'debug_toolbar.panels.signals.SignalsPanel',
-    'debug_toolbar.panels.logging.LoggingPanel',
-    'debug_toolbar.panels.redirects.RedirectsPanel',
-]
-
-# USE_CELERY = False