Goto 1.7, fix HTML5 player polling interval

diff --git a/Dockerfile b/Dockerfile
index cd4d7bba26f57e9696bb58d24aba982e587969f4..b6e0bd0172b19e2fed608742ef680b1dd52c59be 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ WORKDIR /srv/src/telemeta
 
 RUN pip install -r requirements.txt
 RUN pip install -r requirements-dev.txt --src /srv/src
-RUN pip uninstall -y South 
+RUN pip uninstall -y South
 
 # Install Timeside and plugins from ./lib
 COPY ./app/scripts/setup_plugins.sh /srv/app/scripts/setup_plugins.sh

diff --git a/app/scripts/app.sh b/app/scripts/app.sh
index d1eb18abad750ddee70c3b096075c68b8861e352..bb5632a14c7b192932d93319343fb293cbb6c15c 100644 (file)
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@ -18,7 +18,6 @@ uid='www-data'
 gid='www-data'
 
 # stating apps
-#pip install -U django==1.9.12
 pip install -U django==1.8.18
 pip uninstall -y south
 pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat

diff --git a/app/scripts/worker.sh b/app/scripts/worker.sh
index 4a52a2601b5a9ddbe57642bb9ca0f6bd36c59a95..e052b98c313b660742c7caf354afa8f5d7e1035b 100644 (file)
--- a/app/scripts/worker.sh
+++ b/app/scripts/worker.sh
@@ -6,8 +6,13 @@ manage=$app'/manage.py'
 wsgi=$app'/wsgi.py'
 
 # stating apps
-# pip install django-environ redis
+pip install -U django==1.8.18
 pip uninstall -y south
+# pip install django-environ redis
+pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat
+pip install django-debug-toolbar==1.6
+pip install -e git+https://github.com/Parisson/saved_searches.git@dj1.8#egg=saved_searches-2.0.0-beta
+
 
 # waiting for other services
 bash $app/scripts/wait.sh

diff --git a/lib/TimeSide b/lib/TimeSide
index dc644a8a896c46f9c3adf90cb70ebe78f2f95e39..a8d599754de80712a657c115a6e7d22e3dea104c 160000 (submodule)
--- a/lib/TimeSide
+++ b/lib/TimeSide
@@ -1 +1 @@
-Subproject commit dc644a8a896c46f9c3adf90cb70ebe78f2f95e39
+Subproject commit a8d599754de80712a657c115a6e7d22e3dea104c

diff --git a/setup.py b/setup.py
index 7c1adf0e320990163189adcd3058984253d8be1f..e9a8be419b0b9e7d34fdcf127acc548162d1fefc 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ setup(
   long_description = open('README.rst').read(),
   author = "Guillaume Pellerin",
   author_email = "yomguy@parisson.com",
-  version = '1.6.3',
+  version = '1.7.0',
   install_requires = [
         'django==1.8.*',
         'django-registration-redux',

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 0385bc0e5bc4478abc3c0cc6d0a5baf1d0007c95..a4ea8515e83fc95ac2c69d68ad5184cbb39de63f 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -35,6 +35,7 @@
         soundManager.debugMode = false;
         soundManager.useHTML5Audio = true;
         soundManager.preferFlash = false;
+        soundManager.html5PollingInterval = 50;
 
         //initializing the visualizers to be passed to the player
         {% block graphers %}