Merge pull request #421 from pierotofy/bugfixes

Bug fixes

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,

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

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')

worker.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-set -eo pipefail
 __dirname=$(cd $(dirname "$0"); pwd -P)
 cd ${__dirname}