]>
git.parisson.com Git - telemeta.git/log
Guillaume Pellerin [Thu, 7 May 2015 14:33:45 +0000 (16:33 +0200)]
fix various lam needs
yomguy [Thu, 20 Feb 2014 10:49:22 +0000 (11:49 +0100)]
Merge branch 'lam' of git.parisson.com:git/telemeta into lam
Guillaume Pellerin [Thu, 20 Feb 2014 10:46:16 +0000 (11:46 +0100)]
add lam import command
Guillaume Pellerin [Tue, 8 Oct 2013 16:36:52 +0000 (18:36 +0200)]
cleanup
yomguy [Fri, 27 Sep 2013 10:08:45 +0000 (12:08 +0200)]
Merge branch 'lam' of git+ssh://vcs.parisson.com/var/git/telemeta into lam
yomguy [Fri, 27 Sep 2013 10:07:37 +0000 (12:07 +0200)]
fix some translations, add docs, hide some item fields, fix some styles (lesaec)
Guillaume Pellerin [Fri, 27 Sep 2013 10:02:53 +0000 (12:02 +0200)]
; between interprets
Guillaume Pellerin [Fri, 27 Sep 2013 09:56:52 +0000 (11:56 +0200)]
unhide item.track
Guillaume Pellerin [Fri, 27 Sep 2013 09:38:44 +0000 (11:38 +0200)]
fix / update kdenlive parsing
yomguy [Tue, 8 Jan 2013 08:35:11 +0000 (09:35 +0100)]
Merge branch 'dev' into lam
yomguy [Tue, 8 Jan 2013 08:28:23 +0000 (09:28 +0100)]
cleanup
yomguy [Tue, 8 Jan 2013 08:27:47 +0000 (09:27 +0100)]
Merge branch 'dev' into lam
Conflicts:
telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/de/LC_MESSAGES/djangojs.po
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/django.po
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.po
yomguy [Tue, 8 Jan 2013 08:19:57 +0000 (09:19 +0100)]
remove mime type from item title
yomguy [Tue, 8 Jan 2013 08:03:27 +0000 (09:03 +0100)]
add MediaItemTranscoded, special marker tweak to import KDEnLive sessions and their time markers as item.related
yomguy [Mon, 7 Jan 2013 15:15:56 +0000 (16:15 +0100)]
add KDEnLive session parser
yomguy [Mon, 7 Jan 2013 10:07:05 +0000 (11:07 +0100)]
add DE pages (thanks to Patrik Tschudin)
yomguy [Tue, 1 Jan 2013 09:34:18 +0000 (10:34 +0100)]
update DE locale (thanks again patsch!)
yomguy [Wed, 19 Dec 2012 18:31:26 +0000 (19:31 +0100)]
update locale/de
yomguy [Wed, 19 Dec 2012 17:06:48 +0000 (18:06 +0100)]
update de locale (many thanks to +Patrik Tschudin!)
yomguy [Tue, 18 Dec 2012 09:57:38 +0000 (10:57 +0100)]
Merge branch 'master' into lam
Conflicts:
telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/de/LC_MESSAGES/djangojs.po
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/django.po
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.po
yomguy [Tue, 18 Dec 2012 09:14:50 +0000 (10:14 +0100)]
Merge branch 'dev'
yomguy [Tue, 18 Dec 2012 09:14:33 +0000 (10:14 +0100)]
readd locales
yomguy [Tue, 18 Dec 2012 09:13:38 +0000 (10:13 +0100)]
undo submodule for locales
yomguy [Fri, 14 Dec 2012 09:27:42 +0000 (10:27 +0100)]
fix item mime_type processing
yomguy [Mon, 19 Nov 2012 22:15:33 +0000 (23:15 +0100)]
update locales
yomguy [Mon, 19 Nov 2012 16:53:34 +0000 (17:53 +0100)]
cleanup
yomguy [Mon, 19 Nov 2012 16:08:46 +0000 (17:08 +0100)]
rm locales : go to a separate (submodule) repo
yomguy [Mon, 19 Nov 2012 15:58:16 +0000 (16:58 +0100)]
go to 1.4.5
yomguy [Mon, 19 Nov 2012 11:03:21 +0000 (12:03 +0100)]
add partial state to PUBLIC_ACCESS_CHOICES, add fr locales for all those states
yomguy [Mon, 12 Nov 2012 17:10:11 +0000 (18:10 +0100)]
fix os
yomguy [Mon, 12 Nov 2012 17:09:05 +0000 (18:09 +0100)]
add mimetype to item.str, fix no file for mimetype
yomguy [Mon, 12 Nov 2012 17:01:18 +0000 (18:01 +0100)]
add mimetype to item
yomguy [Mon, 12 Nov 2012 07:43:57 +0000 (08:43 +0100)]
fix folded divs
yomguy [Mon, 12 Nov 2012 07:39:57 +0000 (08:39 +0100)]
cleanup
yomguy [Mon, 8 Oct 2012 13:38:20 +0000 (15:38 +0200)]
Merge branch 'dev'
yomguy [Mon, 8 Oct 2012 13:38:13 +0000 (15:38 +0200)]
Merge branch 'dev' into lam
yomguy [Mon, 8 Oct 2012 13:35:57 +0000 (15:35 +0200)]
fix export formats
yomguy [Mon, 8 Oct 2012 13:23:25 +0000 (15:23 +0200)]
restrict download formats for item, so you need to choose export formats explicitely with TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', webm')
yomguy [Fri, 5 Oct 2012 08:57:04 +0000 (10:57 +0200)]
unfold
yomguy [Thu, 4 Oct 2012 14:45:36 +0000 (16:45 +0200)]
Merge branch 'dev'
yomguy [Thu, 4 Oct 2012 14:45:18 +0000 (16:45 +0200)]
fix doc
yomguy [Thu, 4 Oct 2012 14:34:48 +0000 (16:34 +0200)]
Merge branch 'dev'
yomguy [Thu, 4 Oct 2012 14:34:04 +0000 (16:34 +0200)]
fix doc
yomguy [Thu, 4 Oct 2012 11:53:51 +0000 (13:53 +0200)]
Merge branch 'dev' into lam
yomguy [Thu, 4 Oct 2012 11:16:52 +0000 (13:16 +0200)]
Merge branch 'dev'
yomguy [Thu, 4 Oct 2012 11:16:40 +0000 (13:16 +0200)]
fix doc
yomguy [Thu, 4 Oct 2012 10:49:58 +0000 (12:49 +0200)]
Merge branch 'dev' into lam
yomguy [Thu, 4 Oct 2012 10:49:30 +0000 (12:49 +0200)]
move DC button
yomguy [Tue, 2 Oct 2012 22:15:48 +0000 (00:15 +0200)]
all branches to github
yomguy [Tue, 2 Oct 2012 21:38:07 +0000 (23:38 +0200)]
Merge branch 'master' into lam
yomguy [Tue, 2 Oct 2012 21:14:07 +0000 (23:14 +0200)]
fix manifest
yomguy [Tue, 2 Oct 2012 21:10:39 +0000 (23:10 +0200)]
Merge branch 'master' into lam
yomguy [Tue, 2 Oct 2012 21:10:29 +0000 (23:10 +0200)]
Merge branch 'master' into dev
yomguy [Tue, 2 Oct 2012 21:09:52 +0000 (23:09 +0200)]
Merge branch 'hotfix/news'
yomguy [Tue, 2 Oct 2012 21:09:27 +0000 (23:09 +0200)]
fix doc
yomguy [Tue, 2 Oct 2012 14:01:43 +0000 (16:01 +0200)]
again
yomguy [Tue, 2 Oct 2012 14:00:51 +0000 (16:00 +0200)]
update doc
yomguy [Tue, 2 Oct 2012 13:28:17 +0000 (15:28 +0200)]
update doc
yomguy [Tue, 2 Oct 2012 12:30:32 +0000 (14:30 +0200)]
cleanup sandbox, update diagram
yomguy [Tue, 2 Oct 2012 12:19:03 +0000 (14:19 +0200)]
* delete timeside static files, please ADD 'timeside' to INSTALLED_APPS
* cleanup
yomguy [Tue, 2 Oct 2012 11:59:54 +0000 (13:59 +0200)]
Merge branch 'release/1.4.4'
yomguy [Tue, 2 Oct 2012 09:17:54 +0000 (11:17 +0200)]
Merge branch 'dev' into lam
yomguy [Tue, 2 Oct 2012 09:17:41 +0000 (11:17 +0200)]
fix view name
yomguy [Tue, 2 Oct 2012 09:04:32 +0000 (11:04 +0200)]
Merge branch 'dev' into lam
yomguy [Tue, 2 Oct 2012 08:59:21 +0000 (10:59 +0200)]
rm htdocs
yomguy [Mon, 1 Oct 2012 15:01:15 +0000 (17:01 +0200)]
fix other edit buttons
yomguy [Mon, 1 Oct 2012 13:07:46 +0000 (15:07 +0200)]
Merge branch 'dev' into lam
Conflicts:
telemeta/templates/telemeta/mediaitem_detail.html
telemeta/views/item.py
yomguy [Mon, 1 Oct 2012 13:02:51 +0000 (15:02 +0200)]
fix more redirects
yomguy [Mon, 1 Oct 2012 12:46:12 +0000 (14:46 +0200)]
fix resource edit buttons and links, fix many redirect links in views
yomguy [Fri, 28 Sep 2012 15:21:51 +0000 (17:21 +0200)]
fix locale, fold blocks on item detail
yomguy [Thu, 27 Sep 2012 02:43:51 +0000 (04:43 +0200)]
+1
yomguy [Thu, 27 Sep 2012 02:42:51 +0000 (04:42 +0200)]
add pub sound
yomguy [Thu, 27 Sep 2012 02:40:30 +0000 (04:40 +0200)]
fix home players
yomguy [Thu, 27 Sep 2012 02:40:03 +0000 (04:40 +0200)]
fix home players
yomguy [Thu, 27 Sep 2012 02:31:26 +0000 (04:31 +0200)]
rounding
yomguy [Thu, 27 Sep 2012 02:30:35 +0000 (04:30 +0200)]
rounding home
yomguy [Thu, 27 Sep 2012 01:45:30 +0000 (03:45 +0200)]
merge fixes from lam against timeside 0.4.0-a
yomguy [Thu, 27 Sep 2012 01:00:36 +0000 (03:00 +0200)]
fix analyzers
yomguy [Thu, 27 Sep 2012 00:29:34 +0000 (02:29 +0200)]
fix decoder properties for analyzing against timeside gst branch
yomguy [Wed, 26 Sep 2012 19:11:24 +0000 (21:11 +0200)]
cleanup
yomguy [Wed, 26 Sep 2012 16:22:23 +0000 (18:22 +0200)]
fix streamer
yomguy [Wed, 26 Sep 2012 15:19:19 +0000 (17:19 +0200)]
simplify streamer
yomguy [Wed, 26 Sep 2012 14:32:25 +0000 (16:32 +0200)]
fix metadata during stream
yomguy [Wed, 26 Sep 2012 12:46:23 +0000 (14:46 +0200)]
fix metadata
yomguy [Wed, 26 Sep 2012 12:08:57 +0000 (14:08 +0200)]
fix encoder frames
yomguy [Wed, 26 Sep 2012 11:33:35 +0000 (13:33 +0200)]
locale
yomguy [Wed, 26 Sep 2012 11:21:29 +0000 (13:21 +0200)]
merge lam edit buttons and redirect
yomguy [Wed, 26 Sep 2012 11:20:31 +0000 (13:20 +0200)]
fix edit buttons and redirect
yomguy [Wed, 26 Sep 2012 10:09:43 +0000 (12:09 +0200)]
fix item edit, add, copy buttons and forms
yomguy [Tue, 25 Sep 2012 12:46:02 +0000 (14:46 +0200)]
Merge branch 'dev' into lam
Conflicts:
telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/de/LC_MESSAGES/djangojs.po
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/django.po
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.po
yomguy [Tue, 25 Sep 2012 12:40:29 +0000 (14:40 +0200)]
fix charfield size
yomguy [Tue, 25 Sep 2012 12:32:24 +0000 (14:32 +0200)]
fix double old_code, add keywords
yomguy [Tue, 25 Sep 2012 12:25:20 +0000 (14:25 +0200)]
locale again
yomguy [Tue, 25 Sep 2012 12:17:25 +0000 (14:17 +0200)]
fix locale
yomguy [Tue, 25 Sep 2012 12:14:19 +0000 (14:14 +0200)]
Merge branch 'dev' into lam
Conflicts:
telemeta/forms/media.py
telemeta/templates/telemeta/mediaitem_edit.html
yomguy [Tue, 25 Sep 2012 12:06:17 +0000 (14:06 +0200)]
excluded fields in forms
yomguy [Tue, 25 Sep 2012 10:26:18 +0000 (12:26 +0200)]
fix fr lam locale
yomguy [Tue, 25 Sep 2012 10:22:07 +0000 (12:22 +0200)]
again for fr
yomguy [Tue, 25 Sep 2012 10:17:01 +0000 (12:17 +0200)]
update trans
yomguy [Tue, 25 Sep 2012 10:12:46 +0000 (12:12 +0200)]
Merge branch 'dev' into lam
projects / telemeta.git / log