]>
git.parisson.com Git - telemeta.git/log
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
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 [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: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: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 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 13:38:20 +0000 (15:38 +0200)]
Merge branch 'dev'
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 [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: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: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:14:07 +0000 (23:14 +0200)]
fix manifest
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:41 +0000 (11:17 +0200)]
fix view name
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: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 [Thu, 27 Sep 2012 02:40:30 +0000 (04:40 +0200)]
fix home players
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 [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 11:21:29 +0000 (13:21 +0200)]
merge lam edit buttons and redirect
yomguy [Tue, 25 Sep 2012 12:40:29 +0000 (14:40 +0200)]
fix charfield size
yomguy [Tue, 25 Sep 2012 12:17:25 +0000 (14:17 +0200)]
fix locale
yomguy [Tue, 25 Sep 2012 12:06:17 +0000 (14:06 +0200)]
excluded fields in forms
yomguy [Mon, 24 Sep 2012 10:23:14 +0000 (12:23 +0200)]
fix bad migrations
yomguy [Thu, 20 Sep 2012 16:18:45 +0000 (18:18 +0200)]
add migr
yomguy [Thu, 20 Sep 2012 16:16:33 +0000 (18:16 +0200)]
fix filename length
yomguy [Thu, 20 Sep 2012 15:36:01 +0000 (17:36 +0200)]
fix bad file field
yomguy [Thu, 20 Sep 2012 14:53:29 +0000 (16:53 +0200)]
fix admin css
yomguy [Thu, 20 Sep 2012 14:33:45 +0000 (16:33 +0200)]
Merge branch 'dev'
yomguy [Thu, 20 Sep 2012 14:27:03 +0000 (16:27 +0200)]
fix admin static urls
yomguy [Mon, 17 Sep 2012 16:47:53 +0000 (18:47 +0200)]
Merge branch 'dev'
yomguy [Mon, 17 Sep 2012 16:47:13 +0000 (18:47 +0200)]
original logo
yomguy [Mon, 17 Sep 2012 16:45:46 +0000 (18:45 +0200)]
Merge branch 'dev'
yomguy [Mon, 17 Sep 2012 16:43:07 +0000 (18:43 +0200)]
finally fix image static
yomguy [Mon, 17 Sep 2012 16:22:06 +0000 (18:22 +0200)]
add static again
yomguy [Mon, 17 Sep 2012 16:10:57 +0000 (18:10 +0200)]
add static
yomguy [Mon, 17 Sep 2012 16:08:56 +0000 (18:08 +0200)]
fix images, timeside to static
yomguy [Mon, 17 Sep 2012 16:02:55 +0000 (18:02 +0200)]
cleanup and static libs
yomguy [Mon, 17 Sep 2012 15:11:39 +0000 (17:11 +0200)]
more static
yomguy [Mon, 17 Sep 2012 13:09:37 +0000 (15:09 +0200)]
add lam logo
yomguy [Mon, 17 Sep 2012 13:05:31 +0000 (15:05 +0200)]
add static
yomguy [Mon, 17 Sep 2012 12:47:30 +0000 (14:47 +0200)]
Merge branch 'dev'
yomguy [Mon, 17 Sep 2012 12:46:11 +0000 (14:46 +0200)]
cleanup
yomguy [Mon, 17 Sep 2012 12:44:00 +0000 (14:44 +0200)]
add migr
yomguy [Mon, 17 Sep 2012 12:43:02 +0000 (14:43 +0200)]
split web.base into views.*
yomguy [Mon, 17 Sep 2012 11:08:33 +0000 (13:08 +0200)]
add send_file filewrapper for various exports
yomguy [Wed, 12 Sep 2012 10:06:48 +0000 (12:06 +0200)]
add webm mimetype
yomguy [Fri, 20 Jul 2012 08:53:07 +0000 (10:53 +0200)]
Merge branch 'dev'
yomguy [Fri, 20 Jul 2012 08:52:46 +0000 (10:52 +0200)]
add migr
yomguy [Fri, 20 Jul 2012 08:50:12 +0000 (10:50 +0200)]
Merge branch 'release/1.4.4' into dev
Conflicts:
telemeta/models/media.py
yomguy [Fri, 20 Jul 2012 08:49:01 +0000 (10:49 +0200)]
Merge branch 'release/1.4.4'
yomguy [Wed, 18 Jul 2012 13:40:49 +0000 (15:40 +0200)]
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
yomguy [Wed, 18 Jul 2012 13:40:15 +0000 (15:40 +0200)]
add max_length=255 to related media
yomguy [Tue, 17 Jul 2012 23:00:32 +0000 (01:00 +0200)]
item.file max_length=255
yomguy [Mon, 9 Jul 2012 11:42:59 +0000 (13:42 +0200)]
Merge branch 'dev'
yomguy [Mon, 9 Jul 2012 11:42:22 +0000 (13:42 +0200)]
add tag to test if app in installed
projects / telemeta.git / log