--- a/.hgignore Tue Jul 15 17:33:23 2014 +0200
+++ b/.hgignore Thu Sep 04 12:32:29 2014 +0200
@@ -1,17 +1,19 @@
-
-syntax: regexp
-^virtualenv/web/project-boot\.py$
-^virtualenv/web/env$
-^src/spel/config\.py$
-^run$
-^web/static/site$
-^\.pydevproject$
-^\.settings/org\.eclipse\.core\.resources\.prefs$
-^web/\.htaccess$
-^web/static/media/ldt$
-\.mp4$
-\.pyc$
-^sbin/sync/config.py$
-
-syntax: regexp
-^web/static/media/cache$
\ No newline at end of file
+
+syntax: regexp
+^virtualenv/web/project-boot\.py$
+^virtualenv/web/env$
+^src/spel/config\.py$
+^run$
+^web/static/site$
+^\.pydevproject$
+^\.settings/org\.eclipse\.core\.resources\.prefs$
+^web/\.htaccess$
+^web/static/media/ldt$
+\.mp4$
+\.pyc$
+^sbin/sync/config.py$
+
+syntax: regexp
+^web/static/media/cache$
+syntax: glob
+.vagrant/
\ No newline at end of file
--- a/src/spel/static/spel/js/spectacle.js Tue Jul 15 17:33:23 2014 +0200
+++ b/src/spel/static/spel/js/spectacle.js Thu Sep 04 12:32:29 2014 +0200
@@ -141,7 +141,7 @@
zebra : ["even", "odd"],
filter_reset : ".reset"
},
- headers: { 3: { sorter: false } }
+ headers: { 4: { sorter: false } }
});
}
--- a/src/spel/templates/partial/spel_chapters.html Tue Jul 15 17:33:23 2014 +0200
+++ b/src/spel/templates/partial/spel_chapters.html Thu Sep 04 12:32:29 2014 +0200
@@ -26,7 +26,7 @@
</div>
<table class="table table-striped table-condensed tablesorter">
<thead>
- <tr><th>Type</th><th>Ref texte</th><th>Titre de la vidéo</th><th class="popinfo"> </th></tr>
+ <tr><th>Type</th><th>Ref texte</th><th>Titre de la vidéo</th><th>Date de tournage de la vidéo</th><th class="popinfo"> </th></tr>
</thead>
<tbody>
{% for s in segments %}
@@ -34,6 +34,7 @@
<td title="{{ s.cutting_id }}">{{ s.cutting_id|slice:":1"|upper }}</td>
<td>{{ s.tags|get_tags:"ref_text"|join:', ' }}</td>
<td>{% if annot_chapters %}{{ s.ct }}{% else %}{{ s.content.title }}{% endif %}</td>
+ <td>{{ s.content.content_creation_date | date:"Y-m-d" }}</td>
<td>
<span class="glyphicon glyphicon-info-sign popinfo" data-trigger="hover" data-container="body" data-toggle="popover" data-placement="auto"
data-content="<strong>Timecodes:</strong> {{ s.start_ts|str_duration }} - {{ s.start_ts|add:s.duration|str_duration }}<br/>{{ s.tags|get_tags:'group'|safe }}"></span>
--- a/virtualenv/res/lib/lib_create_env.py Tue Jul 15 17:33:23 2014 +0200
+++ b/virtualenv/res/lib/lib_create_env.py Thu Sep 04 12:32:29 2014 +0200
@@ -21,7 +21,7 @@
'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/archive/1.1.1.tar.gz', 'local':"django-extensions-1.1.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'https://bitbucket.org/IRI/django-registration/get/tip.tar.gz', 'local':"IRI-django-registration-e23626c256c0.tar.gz", 'install': {'method': 'easy_install', 'option_str': '-Z', 'dict_extra_env': None}},
'DJANGO-TAGGIT': { 'setup': 'django-taggit', 'url':'https://github.com/alex/django-taggit/archive/0.11.2.tar.gz', 'local':"django-taggit-0.11.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
- 'DJANGO-TAGGIT-TEMPLATETAGS': { 'setup': 'django-taggit-templatetags', 'url':'https://github.com/feuervogel/django-taggit-templatetags/archive/d2216c9d1888e0739a04899a36e5149b5cbb3381.zip', 'local':"django-taggit-a38ee9d8913e05b1993f90c358be5f5397f529eb.zip", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+ 'DJANGO-TAGGIT-TEMPLATETAGS': { 'setup': 'django-taggit-templatetags', 'url':'https://github.com/feuervogel/django-taggit-templatetags/archive/d2216c9d1888e0739a04899a36e5149b5cbb3381.zip', 'local':"django-taggit-templatetags-d2216c9d1888e0739a04899a36e5149b5cbb3381.zip", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
'OAUTH2': { 'setup': 'python-oauth2', 'url':"https://github.com/simplegeo/python-oauth2/tarball/hudson-python-oauth2-211", 'local':"oauth2-1.5.211.tar.gz", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}},
'HTTPLIB2': { 'setup': 'python-httplib2', 'url':'https://httplib2.googlecode.com/files/httplib2-0.8.tar.gz', 'local':"httplib2-0.8.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
'DJANGO-OAUTH-PLUS': { 'setup': 'django-oauth-plus', 'url':'https://pypi.python.org/packages/source/d/django-oauth-plus/django-oauth-plus-2.1.0.tar.gz', 'local':"django-oauth-plus-2.1.0.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},