From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 15 Apr 2015 08:35:23 +0000 (+0200)
Subject: Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
X-Git-Tag: 2.8.1-pro~282^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ab123a8a998ce88c547a184b409bb3201de46671;p=teleforma.git

Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro

Conflicts:
	teleforma/templates/teleforma/seminar_media_video.html
---

ab123a8a998ce88c547a184b409bb3201de46671
diff --cc teleforma/templates/teleforma/seminar_media_video.html
index d3574326,d3ab785a..0cb7dd16
--- a/teleforma/templates/teleforma/seminar_media_video.html
+++ b/teleforma/templates/teleforma/seminar_media_video.html
@@@ -96,7 -96,8 +96,7 @@@ $(window).ready(function()
  <div class="media">
  
  <div class="video">
- <video id="my_video_1" class="video-js vjs-default-skin" width="640" height="360" controls preload="metadata" {% if media.item.related.all %}{% for related in media.item.related.all %}{% if related.title == "preview" %}poster="{{ MEDIA_URL }}{{ related.file }}"{% endif %}{% endfor %}{% endif %} data-setup='{}'>
+ <video id="my_video_1" class="video-js vjs-default-skin" width="640" height="360" controls preload="none" {% if media.item.related.all %}{% for related in media.item.related.all %}{% if related.title == "preview" %}poster="{{ MEDIA_URL }}{{ related.file }}"{% endif %}{% endfor %}{% endif %} data-setup='{}'>
 -    <source src="{{ MEDIA_URL }}{{ media.item.file }}#t=0" type="{{ media.mime_type }}" />
    {% for transcoded in media.item.transcoded.all %}
     {% if "video" in transcoded.mime_type %}
      <source src="{{ MEDIA_URL }}{{ transcoded.file }}#t=0" type="{{ transcoded.mime_type }}" />