Merge branch 'pb-notelemeta' into pb-docker

diff --cc teleforma/admin.py
Simple merge

diff --cc teleforma/context_processors.py
Simple merge

diff --cc teleforma/management/commands/teleforma-export-avis.py
Simple merge

diff --cc teleforma/management/commands/teleforma-import-seminar-media-update.py
Simple merge

diff --cc teleforma/models/core.py
index 63830c2440a8b7b8837493ae73cff54f2faa0159,4614c90b921f97f5885588f10a23b5c9924580c6..4783f1166303c053a1590bae15f7c48333b18901
--- 1/teleforma/models/core.py
--- 2/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@@ -576,9 -577,11 +576,11 @@@ class Media(MediaBase)
      type            = CharField(_('type'), choices=streaming_choices, max_length=32)
      rank            = IntegerField(_('rank'), blank=True, null=True)
      readers         = ManyToManyField(User, related_name="media", verbose_name=_('readers'),
 -                                        blank=True, null=True)
 +                                        blank=True)
      file            = models.FileField(_('file'), upload_to='items/%Y/%m/%d', max_length=1024, null=True, blank=False)
      poster_file     = models.FileField(_('poster file'), upload_to='items/%Y/%m/%d', max_length=255, null=True, blank=False)
+     approx_duration = DurationField(_('approximative duration'))
+ 
  
      def set_mime_type(self):
          if self.file:

diff --cc teleforma/models/pro.py
Simple merge

diff --cc teleforma/templates/teleforma/seminar_detail.html
Simple merge

diff --cc teleforma/views/pro.py
Simple merge