]>
git.parisson.com Git - telemeta.git/log
Guillaume Pellerin [Wed, 8 Jan 2014 22:45:31 +0000 (23:45 +0100)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Wed, 8 Jan 2014 22:45:02 +0000 (23:45 +0100)]
re-add resource reference removal
Guillaume Pellerin [Wed, 8 Jan 2014 22:38:01 +0000 (23:38 +0100)]
migration regression
Guillaume Pellerin [Wed, 8 Jan 2014 21:25:52 +0000 (22:25 +0100)]
copy resource description to descriptions (transition)
Guillaume Pellerin [Mon, 6 Jan 2014 15:54:05 +0000 (16:54 +0100)]
re-order migrations
Guillaume Pellerin [Mon, 6 Jan 2014 15:52:28 +0000 (16:52 +0100)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Mon, 6 Jan 2014 15:51:47 +0000 (16:51 +0100)]
cleanup migrations, add descriptions to resource prepare migration from charfield to textfield
Guillaume Pellerin [Mon, 6 Jan 2014 15:24:40 +0000 (16:24 +0100)]
remove reference field
Guillaume Pellerin [Thu, 2 Jan 2014 09:44:18 +0000 (10:44 +0100)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Thu, 2 Jan 2014 09:43:59 +0000 (10:43 +0100)]
no publish references if empty
Guillaume Pellerin [Mon, 30 Dec 2013 23:13:02 +0000 (00:13 +0100)]
add has_mediafile (sound) to all resources
Guillaume Pellerin [Mon, 30 Dec 2013 23:13:02 +0000 (00:13 +0100)]
add has_mediafile (sound) to all resources
Guillaume Pellerin [Mon, 30 Dec 2013 22:49:15 +0000 (23:49 +0100)]
fix no or default collection.alt_ids
Guillaume Pellerin [Mon, 30 Dec 2013 22:15:38 +0000 (23:15 +0100)]
locales
Guillaume Pellerin [Mon, 30 Dec 2013 22:11:51 +0000 (23:11 +0100)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Mon, 30 Dec 2013 22:11:09 +0000 (23:11 +0100)]
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
Guillaume Pellerin [Mon, 30 Dec 2013 22:09:58 +0000 (23:09 +0100)]
fix styles
Guillaume Pellerin [Mon, 30 Dec 2013 22:09:58 +0000 (23:09 +0100)]
fix styles
Guillaume Pellerin [Sun, 29 Dec 2013 22:27:00 +0000 (23:27 +0100)]
Merge branch 'master' of /var/git/telemeta into dev
Guillaume Pellerin [Sun, 29 Dec 2013 22:26:48 +0000 (23:26 +0100)]
add @ to username
Guillaume Pellerin [Sun, 29 Dec 2013 22:12:03 +0000 (23:12 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Sun, 29 Dec 2013 22:11:46 +0000 (23:11 +0100)]
add deps
Guillaume Pellerin [Thu, 26 Dec 2013 15:00:50 +0000 (16:00 +0100)]
fix xml exception
Guillaume Pellerin [Thu, 26 Dec 2013 14:53:08 +0000 (15:53 +0100)]
bugfix
Guillaume Pellerin [Thu, 26 Dec 2013 14:47:49 +0000 (15:47 +0100)]
locales
Guillaume Pellerin [Thu, 26 Dec 2013 14:46:16 +0000 (15:46 +0100)]
Merge branch 'dev2' into dev
Guillaume Pellerin [Fri, 20 Dec 2013 18:19:19 +0000 (19:19 +0100)]
fix inputs
Guillaume Pellerin [Thu, 26 Dec 2013 14:18:35 +0000 (15:18 +0100)]
bugfix
Guillaume Pellerin [Fri, 20 Dec 2013 18:19:19 +0000 (19:19 +0100)]
fix inputs
Guillaume Pellerin [Fri, 20 Dec 2013 10:51:52 +0000 (11:51 +0100)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Fri, 20 Dec 2013 10:51:32 +0000 (11:51 +0100)]
item filter by collection code
Guillaume Pellerin [Fri, 20 Dec 2013 09:36:45 +0000 (10:36 +0100)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Fri, 20 Dec 2013 09:36:10 +0000 (10:36 +0100)]
update input width, fix item lists
Guillaume Pellerin [Thu, 19 Dec 2013 12:46:07 +0000 (13:46 +0100)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Thu, 19 Dec 2013 12:45:21 +0000 (13:45 +0100)]
add jqchat as notes on enumerations and instruments
Guillaume Pellerin [Thu, 19 Dec 2013 11:13:21 +0000 (12:13 +0100)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Thu, 19 Dec 2013 11:12:03 +0000 (12:12 +0100)]
no notes but chat
Guillaume Pellerin [Thu, 19 Dec 2013 10:42:21 +0000 (11:42 +0100)]
Merge branch 'dev'
Conflicts:
tools/scripts/transcode/transcode.py
Guillaume Pellerin [Thu, 19 Dec 2013 10:31:03 +0000 (11:31 +0100)]
fix instrument replace
Guillaume Pellerin [Thu, 19 Dec 2013 10:31:03 +0000 (11:31 +0100)]
fix instrument replace
Guillaume Pellerin [Thu, 19 Dec 2013 10:13:35 +0000 (11:13 +0100)]
Merge branch 'dev' into crem2
Conflicts:
telemeta/models/media.py
Guillaume Pellerin [Thu, 19 Dec 2013 10:12:38 +0000 (11:12 +0100)]
add instrument replace view
Guillaume Pellerin [Tue, 17 Dec 2013 19:22:39 +0000 (20:22 +0100)]
display doctype_code if not null or 0
Guillaume Pellerin [Tue, 17 Dec 2013 19:12:59 +0000 (20:12 +0100)]
order fonds and corpus by code
Guillaume Pellerin [Tue, 17 Dec 2013 19:10:01 +0000 (20:10 +0100)]
add code filters for items (published / unpublished)
Guillaume Pellerin [Tue, 17 Dec 2013 19:05:59 +0000 (20:05 +0100)]
rm reference field for MediaBaseResource
Guillaume Pellerin [Tue, 17 Dec 2013 19:00:28 +0000 (20:00 +0100)]
add notes to all enumerations, add sound check for collections in corpus
Guillaume Pellerin [Tue, 17 Dec 2013 17:20:41 +0000 (18:20 +0100)]
Merge branch 'crem2' of git+ssh://vcs.parisson.com/var/git/telemeta into crem2
Guillaume Pellerin [Tue, 17 Dec 2013 17:20:14 +0000 (18:20 +0100)]
locales
Guillaume Pellerin [Tue, 17 Dec 2013 17:19:42 +0000 (18:19 +0100)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Tue, 17 Dec 2013 17:18:27 +0000 (18:18 +0100)]
locales
Guillaume Pellerin [Tue, 17 Dec 2013 17:11:34 +0000 (18:11 +0100)]
Merge branch 'dev' into crem2
Conflicts:
telemeta/models/media.py
Guillaume Pellerin [Tue, 17 Dec 2013 17:09:30 +0000 (18:09 +0100)]
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
Guillaume Pellerin [Tue, 17 Dec 2013 17:07:31 +0000 (18:07 +0100)]
add replacement method for enumeration value (fixes #99)
Guillaume Pellerin [Sun, 15 Dec 2013 23:11:36 +0000 (00:11 +0100)]
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
Guillaume Pellerin [Sun, 15 Dec 2013 23:09:45 +0000 (00:09 +0100)]
goto stereo, tune x264 for 480p
Guillaume Pellerin [Wed, 11 Dec 2013 07:53:43 +0000 (08:53 +0100)]
fix graph render output
Guillaume Pellerin [Fri, 6 Dec 2013 09:48:48 +0000 (10:48 +0100)]
add '+' to code, try default grapher
Guillaume Pellerin [Wed, 4 Dec 2013 21:35:07 +0000 (22:35 +0100)]
redo mp3 and png
Guillaume Pellerin [Wed, 4 Dec 2013 21:31:15 +0000 (22:31 +0100)]
import transcode scripts from telecaster branch
Guillaume Pellerin [Wed, 4 Dec 2013 21:30:32 +0000 (22:30 +0100)]
more mlt batch options
Guillaume Pellerin [Wed, 4 Dec 2013 16:27:14 +0000 (17:27 +0100)]
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
Guillaume Pellerin [Wed, 4 Dec 2013 16:26:51 +0000 (17:26 +0100)]
add generic item import
Guillaume Pellerin [Wed, 4 Dec 2013 16:26:03 +0000 (17:26 +0100)]
fix postgres query again
Guillaume Pellerin [Wed, 4 Dec 2013 16:09:57 +0000 (17:09 +0100)]
fix postgres query
Guillaume Pellerin [Tue, 26 Nov 2013 10:39:23 +0000 (11:39 +0100)]
update revision plot: server mode, args, etc..
Guillaume Pellerin [Mon, 25 Nov 2013 21:44:47 +0000 (22:44 +0100)]
dryer
Guillaume Pellerin [Mon, 25 Nov 2013 17:55:26 +0000 (18:55 +0100)]
finalize crem import
Guillaume Pellerin [Mon, 25 Nov 2013 17:01:07 +0000 (18:01 +0100)]
fix options
Guillaume Pellerin [Mon, 25 Nov 2013 16:59:37 +0000 (17:59 +0100)]
rm some args
Guillaume Pellerin [Mon, 25 Nov 2013 16:57:52 +0000 (17:57 +0100)]
bugfix
Guillaume Pellerin [Mon, 25 Nov 2013 16:53:28 +0000 (17:53 +0100)]
make CREM import a base command, add revision plot scripts
Guillaume Pellerin [Mon, 25 Nov 2013 15:25:00 +0000 (16:25 +0100)]
merge from crem2
Guillaume Pellerin [Mon, 25 Nov 2013 15:23:27 +0000 (16:23 +0100)]
begin enumeration replace
Guillaume Pellerin [Sun, 10 Nov 2013 08:58:48 +0000 (09:58 +0100)]
check upload tmp_dir existence
Guillaume Pellerin [Mon, 14 Oct 2013 12:49:27 +0000 (14:49 +0200)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Mon, 14 Oct 2013 12:49:04 +0000 (14:49 +0200)]
fix type image URLs
Guillaume Pellerin [Fri, 11 Oct 2013 13:53:11 +0000 (15:53 +0200)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Fri, 11 Oct 2013 13:52:52 +0000 (15:52 +0200)]
fix normal view button on collection DC
Guillaume Pellerin [Sun, 29 Sep 2013 20:57:06 +0000 (22:57 +0200)]
add "" to paths in scripts
Guillaume Pellerin [Mon, 23 Sep 2013 11:54:07 +0000 (13:54 +0200)]
fix script paths and args
Guillaume Pellerin [Fri, 28 Jun 2013 22:36:09 +0000 (00:36 +0200)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Fri, 28 Jun 2013 22:35:32 +0000 (00:35 +0200)]
cleanup urls: NO more hdocs
Guillaume Pellerin [Fri, 28 Jun 2013 22:27:17 +0000 (00:27 +0200)]
fix a css image
Guillaume Pellerin [Fri, 28 Jun 2013 21:34:54 +0000 (23:34 +0200)]
Merge branch 'diadems' into crem2
Guillaume Pellerin [Fri, 28 Jun 2013 21:34:32 +0000 (23:34 +0200)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Fri, 28 Jun 2013 21:33:30 +0000 (23:33 +0200)]
fix django==1.4.5, cleanup deps
Guillaume Pellerin [Fri, 28 Jun 2013 21:00:50 +0000 (23:00 +0200)]
add thread parameter to transcode
Guillaume Pellerin [Sat, 22 Jun 2013 21:26:23 +0000 (23:26 +0200)]
fix transcode script
Guillaume Pellerin [Sat, 22 Jun 2013 21:15:11 +0000 (23:15 +0200)]
add thumbs and dry-run to transcode
Guillaume Pellerin [Sat, 22 Jun 2013 16:02:15 +0000 (18:02 +0200)]
add time to transcoder logger
Guillaume Pellerin [Fri, 21 Jun 2013 20:23:40 +0000 (22:23 +0200)]
fix kdenlive rendering
Guillaume Pellerin [Fri, 21 Jun 2013 20:06:56 +0000 (22:06 +0200)]
fix fading in kdenlive rendering
Guillaume Pellerin [Fri, 21 Jun 2013 19:22:11 +0000 (21:22 +0200)]
add fading kdenlive rendering batch
Guillaume Pellerin [Tue, 18 Jun 2013 15:54:21 +0000 (17:54 +0200)]
add allowZip64=True to collection zip package
Guillaume Pellerin [Tue, 18 Jun 2013 15:20:02 +0000 (17:20 +0200)]
zip collection package in settings.FILE_UPLOAD_TEMP_DIR
Guillaume Pellerin [Thu, 13 Jun 2013 17:25:10 +0000 (19:25 +0200)]
locale
Guillaume Pellerin [Thu, 13 Jun 2013 17:20:23 +0000 (19:20 +0200)]
fix no file
Guillaume Pellerin [Thu, 13 Jun 2013 17:15:28 +0000 (19:15 +0200)]
add collection zip package button and view
Guillaume Pellerin [Thu, 13 Jun 2013 11:47:37 +0000 (13:47 +0200)]
Merge branch 'crem2' into diadems
projects / telemeta.git / log