From 7b20095e991bbb33852132b5701f7aa3cdb55f0b Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 3 May 2017 19:14:06 +0200 Subject: [PATCH] Goto 1.7, fix HTML5 player polling interval --- Dockerfile | 2 +- app/scripts/app.sh | 1 - app/scripts/worker.sh | 7 ++++++- lib/TimeSide | 2 +- setup.py | 2 +- telemeta/templates/telemeta/mediaitem_detail.html | 1 + 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index cd4d7bba..b6e0bd01 100644 --- 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 d1eb18ab..bb5632a1 100644 --- 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 4a52a260..e052b98c 100644 --- 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 dc644a8a..a8d59975 160000 --- a/lib/TimeSide +++ b/lib/TimeSide @@ -1 +1 @@ -Subproject commit dc644a8a896c46f9c3adf90cb70ebe78f2f95e39 +Subproject commit a8d599754de80712a657c115a6e7d22e3dea104c diff --git a/setup.py b/setup.py index 7c1adf0e..e9a8be41 100644 --- 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 0385bc0e..a4ea8515 100644 --- 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 %} -- 2.39.5