]>
git.parisson.com Git - telemeta.git/log
yomguy [Thu, 14 Mar 2013 14:52:03 +0000 (15:52 +0100)]
readd 0024
yomguy [Thu, 14 Mar 2013 14:47:38 +0000 (15:47 +0100)]
add auto_period_access to collection, fix resource edit rights
yomguy [Wed, 13 Mar 2013 22:15:30 +0000 (23:15 +0100)]
update access rules
yomguy [Wed, 13 Mar 2013 21:58:04 +0000 (22:58 +0100)]
add sound_public query for full access items,
optimize random items query in home,
debug new access workflow
yomguy [Wed, 13 Mar 2013 14:26:16 +0000 (15:26 +0100)]
Merge branch 'crem' into crem2
Conflicts:
telemeta/models/media.py
telemeta/views/core.py
yomguy [Fri, 1 Mar 2013 12:03:03 +0000 (13:03 +0100)]
Merge branch 'dev' into crem
yomguy [Fri, 1 Mar 2013 12:01:59 +0000 (13:01 +0100)]
fix overwrite
yomguy [Fri, 1 Mar 2013 10:42:33 +0000 (11:42 +0100)]
Merge branch 'dev' into crem
yomguy [Fri, 1 Mar 2013 10:42:11 +0000 (11:42 +0100)]
fix encoder overwriting
yomguy [Thu, 28 Feb 2013 11:05:34 +0000 (12:05 +0100)]
add PublisherCollection to admin
yomguy [Thu, 28 Feb 2013 10:51:29 +0000 (11:51 +0100)]
fix fr locale (closes: #107)
yomguy [Thu, 28 Feb 2013 10:14:33 +0000 (11:14 +0100)]
Merge branch 'dev' into crem
Conflicts:
telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
yomguy [Thu, 28 Feb 2013 09:53:15 +0000 (10:53 +0100)]
fix related media parsing
yomguy [Thu, 28 Feb 2013 09:40:18 +0000 (10:40 +0100)]
fix related media parsing when no file (closes: #106)
Conflicts:
telemeta/models/media.py
yomguy [Tue, 19 Feb 2013 10:00:27 +0000 (11:00 +0100)]
locales
yomguy [Thu, 14 Feb 2013 16:23:01 +0000 (17:23 +0100)]
locales
yomguy [Thu, 14 Feb 2013 15:50:52 +0000 (16:50 +0100)]
fix init account email
yomguy [Thu, 14 Feb 2013 15:50:01 +0000 (16:50 +0100)]
info
yomguy [Mon, 11 Feb 2013 10:30:12 +0000 (11:30 +0100)]
Merge branch 'dev' into crem2
yomguy [Fri, 8 Feb 2013 01:40:37 +0000 (02:40 +0100)]
rename, add kwargs
yomguy [Fri, 8 Feb 2013 00:53:08 +0000 (01:53 +0100)]
fix bad SQL query with postgresl
add relative marker offset to the kdenlive parsing
yomguy [Thu, 7 Feb 2013 14:23:25 +0000 (15:23 +0100)]
cleanup
yomguy [Thu, 7 Feb 2013 14:17:24 +0000 (15:17 +0100)]
fix last entry
yomguy [Thu, 7 Feb 2013 14:09:09 +0000 (15:09 +0100)]
fix comments
yomguy [Thu, 7 Feb 2013 12:02:34 +0000 (13:02 +0100)]
fix multiple clip in session
yomguy [Thu, 7 Feb 2013 09:54:09 +0000 (10:54 +0100)]
fix kdenlive marker parsing (for 1 producer id only)
yomguy [Fri, 18 Jan 2013 09:58:49 +0000 (10:58 +0100)]
fix password reset style
yomguy [Tue, 15 Jan 2013 10:01:50 +0000 (11:01 +0100)]
fix no markers
yomguy [Tue, 15 Jan 2013 09:37:58 +0000 (10:37 +0100)]
fix kdenlive session marker parsing
yomguy [Mon, 14 Jan 2013 16:48:14 +0000 (17:48 +0100)]
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
yomguy [Mon, 14 Jan 2013 16:47:32 +0000 (17:47 +0100)]
fix locale, fix related parsing
yomguy [Sun, 13 Jan 2013 10:59:37 +0000 (11:59 +0100)]
add de home tranlation for CREM (many thanks to Patrik Tschudin!)
yomguy [Sun, 13 Jan 2013 10:50:12 +0000 (11:50 +0100)]
continue new access rules
Guillaume Pellerin [Thu, 10 Jan 2013 11:04:21 +0000 (12:04 +0100)]
Merge branch 'master' into dev
Guillaume Pellerin [Thu, 10 Jan 2013 11:03:04 +0000 (12:03 +0100)]
fix item related file
yomguy [Wed, 9 Jan 2013 13:47:56 +0000 (14:47 +0100)]
begin item workflow refactoring
yomguy [Tue, 8 Jan 2013 09:05:48 +0000 (10:05 +0100)]
add travis scripts
yomguy [Tue, 8 Jan 2013 08:48:24 +0000 (09:48 +0100)]
Merge branch 'dev'
yomguy [Tue, 8 Jan 2013 08:34:57 +0000 (09:34 +0100)]
Merge branch 'dev' into crem
Conflicts:
telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
yomguy [Tue, 8 Jan 2013 08:28:23 +0000 (09:28 +0100)]
cleanup
yomguy [Tue, 8 Jan 2013 08:19:57 +0000 (09:19 +0100)]
remove mime type from item title
yomguy [Tue, 8 Jan 2013 08:11:15 +0000 (09:11 +0100)]
unfold dome detail blocks
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:41 +0000 (11:07 +0100)]
Merge branch 'dev'
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:35:28 +0000 (10:35 +0100)]
Merge branch 'dev'
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 10:03:55 +0000 (11:03 +0100)]
update locale
yomguy [Tue, 18 Dec 2012 10:02:15 +0000 (11:02 +0100)]
Merge branch 'master' into crem
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:39:57 +0000 (08:39 +0100)]
cleanup
yomguy [Mon, 8 Oct 2012 16:05:47 +0000 (18:05 +0200)]
Merge branch 'master' into crem
Conflicts:
tools/dev/push.sh
yomguy [Mon, 8 Oct 2012 13:38:20 +0000 (15:38 +0200)]
Merge branch 'dev'
yomguy [Mon, 8 Oct 2012 13:38:06 +0000 (15:38 +0200)]
Merge branch 'dev' into crem
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:46:53 +0000 (10:46 +0200)]
locale
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:41:49 +0000 (16:41 +0200)]
fix comment place
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: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:51:34 +0000 (12:51 +0200)]
Merge branch 'dev' into crem
yomguy [Thu, 4 Oct 2012 10:49:30 +0000 (12:49 +0200)]
move DC button
yomguy [Thu, 4 Oct 2012 09:53:35 +0000 (11:53 +0200)]
locale
yomguy [Thu, 4 Oct 2012 09:53:03 +0000 (11:53 +0200)]
fix ref
yomguy [Thu, 4 Oct 2012 09:50:58 +0000 (11:50 +0200)]
exclude lam fields
yomguy [Thu, 4 Oct 2012 09:18:15 +0000 (11:18 +0200)]
fold some item blocks
yomguy [Thu, 4 Oct 2012 09:16:51 +0000 (11:16 +0200)]
fix item remarks
Guillaume Pellerin [Thu, 4 Oct 2012 08:59:36 +0000 (10:59 +0200)]
fix crem checker for hidden files
Guillaume Pellerin [Thu, 4 Oct 2012 08:22:08 +0000 (10:22 +0200)]
Merge branch 'crem' of https://github.com/yomguy/Telemeta into crem
yomguy [Thu, 4 Oct 2012 08:20:27 +0000 (10:20 +0200)]
locales
Guillaume Pellerin [Thu, 4 Oct 2012 08:07:36 +0000 (10:07 +0200)]
Merge branch 'crem' of https://github.com/yomguy/Telemeta into crem
yomguy [Thu, 4 Oct 2012 08:05:15 +0000 (10:05 +0200)]
fix crem item detail
yomguy [Tue, 2 Oct 2012 22:15:48 +0000 (00:15 +0200)]
all branches to github
Guillaume Pellerin [Tue, 2 Oct 2012 22:01:36 +0000 (00:01 +0200)]
Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem
yomguy [Tue, 2 Oct 2012 22:00:14 +0000 (00:00 +0200)]
Merge branch 'dev' into crem
Guillaume Pellerin [Tue, 2 Oct 2012 21:48:04 +0000 (23:48 +0200)]
Merge branch 'crem' of https://github.com/yomguy/Telemeta into crem
yomguy [Tue, 2 Oct 2012 21:43:18 +0000 (23:43 +0200)]
Merge branch 'master' into crem
yomguy [Tue, 2 Oct 2012 21:14:07 +0000 (23:14 +0200)]
fix manifest
yomguy [Tue, 2 Oct 2012 21:10:52 +0000 (23:10 +0200)]
Merge branch 'master' into crem
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
projects / telemeta.git / log