From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 2 Jun 2017 11:24:44 +0000 (+0200)
Subject: Merge branch 'dev' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2d3530f30c1973855b24fc4202478b2bbf4a9fa4;p=telemeta.git

Merge branch 'dev' into crem
---

2d3530f30c1973855b24fc4202478b2bbf4a9fa4
diff --cc app/scripts/app.sh
index 6f07073d,f6e454db..84fa6f8e
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@@ -39,12 -39,7 +39,7 @@@ if [ $REINDEX = "True" ]; the
  fi
  
  # fix media access rights
- chown www-data:www-data $media
- for dir in $(ls $media); do
-     if [ ! $(stat -c %U $media/$dir) = 'www-data' ]; then
-         chown www-data:www-data $media/$dir
-     fi
- done
 -chown -R www-data:www-data $media
++chown www-data:www-data $media/*
  
  # choose dev or prod mode
  if [ "$1" = "--runserver" ]; then
diff --cc app/settings.py
index 644717d2,153f00d6..848fdc6e
--- a/app/settings.py
+++ b/app/settings.py
@@@ -201,9 -202,9 +203,9 @@@ TELEMETA_CACHE_DIR = os.path.join(MEDIA
  TELEMETA_EXPORT_CACHE_DIR = os.path.join(MEDIA_ROOT, 'export')
  TELEMETA_DATA_CACHE_DIR = os.path.join(TELEMETA_CACHE_DIR, 'data')
  FILE_UPLOAD_TEMP_DIR = os.path.join(MEDIA_ROOT, 'tmp')
- FILE_UPLOAD_PERMISSIONS = 0644
+ FILE_UPLOAD_PERMISSIONS = 0o644
  
 -TELEMETA_DOWNLOAD_ENABLED = True
 +TELEMETA_DOWNLOAD_ENABLED = False
  TELEMETA_STREAMING_FORMATS = ('mp3', 'ogg')
  TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'ogg', 'flac')
  TELEMETA_PUBLIC_ACCESS_PERIOD = 51
diff --cc lib/TimeSide
index 00000000,004c33b1..a8d59975
mode 000000,160000..160000
--- a/lib/TimeSide
+++ b/lib/TimeSide
@@@ -1,0 -1,1 +1,1 @@@
 -Subproject commit 004c33b1532acafb2f3507fce8909d8f100dab09
++Subproject commit a8d599754de80712a657c115a6e7d22e3dea104c