]>
git.parisson.com Git - telemeta.git/log
Guillaume Pellerin [Thu, 23 Jan 2014 08:54:02 +0000 (09:54 +0100)]
Merge branch 'dev' into sabiod
Guillaume Pellerin [Thu, 23 Jan 2014 08:54:02 +0000 (09:54 +0100)]
fix args
Guillaume Pellerin [Thu, 23 Jan 2014 08:51:06 +0000 (09:51 +0100)]
Merge branch 'dev' into sabiod
Guillaume Pellerin [Thu, 23 Jan 2014 08:50:32 +0000 (09:50 +0100)]
add prefix to URL item import command
Guillaume Pellerin [Wed, 22 Jan 2014 22:10:48 +0000 (23:10 +0100)]
Merge branch 'dev' into sabiod
Guillaume Pellerin [Wed, 22 Jan 2014 22:10:08 +0000 (23:10 +0100)]
back to jquery 1.6
Guillaume Pellerin [Wed, 22 Jan 2014 14:02:55 +0000 (15:02 +0100)]
Merge branch 'dev' into sabiod
Guillaume Pellerin [Wed, 22 Jan 2014 14:02:55 +0000 (15:02 +0100)]
fix names
Guillaume Pellerin [Wed, 22 Jan 2014 13:56:19 +0000 (14:56 +0100)]
Merge branch 'dev' into sabiod
Guillaume Pellerin [Wed, 22 Jan 2014 13:56:19 +0000 (14:56 +0100)]
fix path for import without copy
Guillaume Pellerin [Wed, 22 Jan 2014 13:28:55 +0000 (14:28 +0100)]
Merge branch 'dev' into sabiod
Guillaume Pellerin [Wed, 22 Jan 2014 13:28:54 +0000 (14:28 +0100)]
fix path
Guillaume Pellerin [Wed, 22 Jan 2014 13:25:03 +0000 (14:25 +0100)]
Merge branch 'dev' into sabiod
Guillaume Pellerin [Wed, 22 Jan 2014 13:24:54 +0000 (14:24 +0100)]
fix path
Guillaume Pellerin [Wed, 22 Jan 2014 13:21:32 +0000 (14:21 +0100)]
Merge branch 'dev' into sabiod
Guillaume Pellerin [Wed, 22 Jan 2014 13:14:25 +0000 (14:14 +0100)]
add import script without copying, add processor release after streaming
Guillaume Pellerin [Tue, 21 Jan 2014 23:47:40 +0000 (00:47 +0100)]
add a URLField to MediaItem
add media streaming support from URLs, FIXME: resource sound properties
Thomas Fillon [Tue, 21 Jan 2014 17:48:46 +0000 (18:48 +0100)]
Sabiod : Update the reference to Parisson in Partners
Thomas Fillon [Tue, 21 Jan 2014 17:32:44 +0000 (18:32 +0100)]
Sabiod : Update english home page to suppress musical reference and reformat the Credit section
Thomas Fillon [Tue, 21 Jan 2014 14:46:28 +0000 (15:46 +0100)]
Merge branch 'sabiod' of github.com:yomguy/Telemeta into sabiod
Thomas Fillon [Tue, 21 Jan 2014 14:45:57 +0000 (15:45 +0100)]
Sabiod : Change english home page
Guillaume Pellerin [Tue, 21 Jan 2014 13:48:22 +0000 (14:48 +0100)]
update requirements
Thomas Fillon [Tue, 21 Jan 2014 13:45:50 +0000 (14:45 +0100)]
Sabiod : Change logo in header
Guillaume Pellerin [Tue, 21 Jan 2014 13:09:17 +0000 (14:09 +0100)]
add requirements
Guillaume Pellerin [Tue, 21 Jan 2014 12:31:08 +0000 (13:31 +0100)]
add TIMESIDE_AUTO_ZOOM in settings to auto toggle the player in zooming mode
Guillaume Pellerin [Tue, 21 Jan 2014 12:17:12 +0000 (13:17 +0100)]
add TIMESIDE_DEFAULT_GRAPHER_ID in settings to select the default grapher in the player
Guillaume Pellerin [Tue, 21 Jan 2014 11:59:55 +0000 (12:59 +0100)]
fix deps
Guillaume Pellerin [Tue, 21 Jan 2014 00:24:51 +0000 (01:24 +0100)]
prepare 1.4.6 news
Guillaume Pellerin [Mon, 20 Jan 2014 23:28:07 +0000 (00:28 +0100)]
mm revert
Guillaume Pellerin [Mon, 20 Jan 2014 23:24:40 +0000 (00:24 +0100)]
toobar goes to local urls
Guillaume Pellerin [Mon, 20 Jan 2014 23:23:12 +0000 (00:23 +0100)]
fix toolbar again
Guillaume Pellerin [Mon, 20 Jan 2014 23:20:31 +0000 (00:20 +0100)]
fix no debug toolbar
Guillaume Pellerin [Mon, 20 Jan 2014 22:48:45 +0000 (23:48 +0100)]
update args
Guillaume Pellerin [Mon, 20 Jan 2014 22:44:46 +0000 (23:44 +0100)]
dratically improve collection zip packaqe streaming thanks to zipstream
Conflicts:
telemeta/views/collection.py
Guillaume Pellerin [Mon, 20 Jan 2014 22:04:40 +0000 (23:04 +0100)]
goto 1.4.6
Guillaume Pellerin [Mon, 20 Jan 2014 21:53:43 +0000 (22:53 +0100)]
Merge branch 'feature/ts-0.5' into dev
Guillaume Pellerin [Mon, 20 Jan 2014 21:52:12 +0000 (22:52 +0100)]
Merge branch 'dev' into feature/ts-0.5
Conflicts:
example/sandbox/settings.py
Guillaume Pellerin [Mon, 20 Jan 2014 21:51:23 +0000 (22:51 +0100)]
Merge branch 'master' into dev
Conflicts:
example/sandbox/settings.py
setup.py
Guillaume Pellerin [Mon, 20 Jan 2014 21:41:14 +0000 (22:41 +0100)]
fix deps
Guillaume Pellerin [Mon, 20 Jan 2014 21:20:25 +0000 (22:20 +0100)]
add 1.4.5 news
Guillaume Pellerin [Mon, 20 Jan 2014 20:55:41 +0000 (21:55 +0100)]
only get IValueAnalyzer list for default analyzers
Guillaume Pellerin [Mon, 20 Jan 2014 15:56:53 +0000 (16:56 +0100)]
Adapt analyze method to timeside 0.5.x, update download and streaming format
Guillaume Pellerin [Mon, 20 Jan 2014 12:35:38 +0000 (13:35 +0100)]
add collection zip get methods, add debug_toolbar to sandbox, jquery 2.0.3
Guillaume Pellerin [Mon, 20 Jan 2014 12:35:38 +0000 (13:35 +0100)]
add collection zip get methods, add debug_toolbar to sandbox
Guillaume Pellerin [Sun, 19 Jan 2014 23:41:38 +0000 (00:41 +0100)]
fix unicode xml parsing
Guillaume Pellerin [Thu, 9 Jan 2014 23:46:34 +0000 (00:46 +0100)]
update diags
Guillaume Pellerin [Thu, 9 Jan 2014 15:41:00 +0000 (16:41 +0100)]
undo alt_ids exception for 'Sous-table...'
Conflicts:
telemeta/templates/telemeta/collection_detail.html
Guillaume Pellerin [Thu, 9 Jan 2014 15:15:17 +0000 (16:15 +0100)]
collection.doctype optional
Guillaume Pellerin [Thu, 9 Jan 2014 14:17:04 +0000 (15:17 +0100)]
keep old description
Guillaume Pellerin [Thu, 9 Jan 2014 14:16:34 +0000 (15:16 +0100)]
set description_old
Guillaume Pellerin [Thu, 9 Jan 2014 12:07:49 +0000 (13:07 +0100)]
Instrument.description from charfield to textfield
Guillaume Pellerin [Thu, 9 Jan 2014 09:50:42 +0000 (10:50 +0100)]
add templates and fix admin menu
Guillaume Pellerin [Wed, 8 Jan 2014 22:45:02 +0000 (23:45 +0100)]
re-add resource reference removal
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: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 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 12:55:05 +0000 (13:55 +0100)]
fix classifiers
Guillaume Pellerin [Sun, 29 Dec 2013 22:42:46 +0000 (23:42 +0100)]
fix static image
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 [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:32 +0000 (11:51 +0100)]
item filter by collection code
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:45:21 +0000 (13:45 +0100)]
add jqchat as notes on enumerations and instruments
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: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:18:27 +0000 (18:18 +0100)]
locales
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 [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 [Mon, 14 Oct 2013 12:49:04 +0000 (14:49 +0200)]
fix type image URLs
projects / telemeta.git / log