From a9c5c4b8aef39e7da1cb106d45848094c3fe1f9d Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Sat, 31 Mar 2018 12:48:15 -0400 Subject: [PATCH 1/2] Fixed issue where celery scheduler was not being started --- worker.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/worker.sh b/worker.sh index 6548daff..93507582 100755 --- a/worker.sh +++ b/worker.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -eo pipefail __dirname=$(cd $(dirname "$0"); pwd -P) cd ${__dirname} From 3a55dea1b3915fc74f4b19eae04128db24b1003e Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Sat, 31 Mar 2018 13:08:56 -0400 Subject: [PATCH 2/2] CORS update, Safari text mime fix --- app/static/app/js/components/ProjectListItem.jsx | 2 +- requirements.txt | 2 +- webodm/settings.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/static/app/js/components/ProjectListItem.jsx b/app/static/app/js/components/ProjectListItem.jsx index e97ffb5c..aac9e2eb 100644 --- a/app/static/app/js/components/ProjectListItem.jsx +++ b/app/static/app/js/components/ProjectListItem.jsx @@ -108,7 +108,7 @@ class ProjectListItem extends React.Component { url : `/api/projects/${this.state.data.id}/tasks/`, parallelUploads: 2147483647, uploadMultiple: true, - acceptedFiles: "image/*, .txt", + acceptedFiles: "image/*,text/*", autoProcessQueue: false, createImageThumbnails: false, clickable: this.uploadButton, diff --git a/requirements.txt b/requirements.txt index b81604fc..acb7f584 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ django-appconf==1.0.2 django-codemirror2==0.2 django-colorfield==0.1.14 django-compressor==2.2 -django-cors-headers==2.0.2 +django-cors-headers==2.2.0 django-filter==1.1.0 django-guardian==1.4.9 django-imagekit==4.0.1 diff --git a/webodm/settings.py b/webodm/settings.py index 7adfbe7f..e81d0110 100644 --- a/webodm/settings.py +++ b/webodm/settings.py @@ -246,6 +246,7 @@ LOGIN_URL = '/login/' # CORS (very relaxed settings, users might want to change this in production) CORS_ORIGIN_ALLOW_ALL = True +CORS_ALLOW_CREDENTIALS = True # File uploads MEDIA_ROOT = os.path.join(BASE_DIR, 'app', 'media')