]>
git.parisson.com Git - telemeta.git/log
Guillaume Pellerin [Mon, 3 Mar 2014 17:37:11 +0000 (18:37 +0100)]
Merge branch 'crem' into diadems
Guillaume Pellerin [Mon, 3 Mar 2014 16:09:12 +0000 (17:09 +0100)]
Merge branch 'crem' of git+ssh://vcs.parisson.com/var/git/telemeta into crem
Guillaume Pellerin [Mon, 3 Mar 2014 16:09:03 +0000 (17:09 +0100)]
Merge branch 'dev' into crem
Guillaume Pellerin [Mon, 3 Mar 2014 16:08:44 +0000 (17:08 +0100)]
Merge branch 'master' into crem
Guillaume Pellerin [Mon, 3 Mar 2014 16:08:35 +0000 (17:08 +0100)]
fix setup
Guillaume Pellerin [Mon, 3 Mar 2014 16:06:56 +0000 (17:06 +0100)]
Merge branch 'crem2' into crem
Guillaume Pellerin [Mon, 3 Mar 2014 16:06:07 +0000 (17:06 +0100)]
fix crem hidden fields, add output param to revision plot
Guillaume Pellerin [Fri, 21 Feb 2014 16:47:06 +0000 (17:47 +0100)]
Merge branch 'crem' into diadems
Conflicts:
telemeta/views/item.py
Guillaume Pellerin [Fri, 21 Feb 2014 16:45:19 +0000 (17:45 +0100)]
Merge branch 'dev' into crem
Guillaume Pellerin [Fri, 21 Feb 2014 16:44:14 +0000 (17:44 +0100)]
update title, fix requirements setup
Guillaume Pellerin [Thu, 20 Feb 2014 12:53:36 +0000 (13:53 +0100)]
update deps
Guillaume Pellerin [Thu, 20 Feb 2014 12:51:05 +0000 (13:51 +0100)]
rm debug_toolbar from sandbox, update zipstream to follow the github version
Guillaume Pellerin [Fri, 14 Feb 2014 20:27:31 +0000 (21:27 +0100)]
Merge branch 'dev' into crem
Conflicts:
example/sandbox/settings.py
telemeta/urls.py
telemeta/views/item.py
Guillaume Pellerin [Thu, 13 Feb 2014 23:49:20 +0000 (00:49 +0100)]
Item : fix pipe streaming against TimeSide 0.5.4 (thanks @thomasfillon !)
Guillaume Pellerin [Tue, 11 Feb 2014 10:09:40 +0000 (11:09 +0100)]
do not compute all graphers at item import
Guillaume Pellerin [Fri, 7 Feb 2014 17:20:01 +0000 (18:20 +0100)]
bugfix
Guillaume Pellerin [Fri, 7 Feb 2014 17:18:08 +0000 (18:18 +0100)]
add a command to fix item markers
Guillaume Pellerin [Fri, 7 Feb 2014 08:26:45 +0000 (09:26 +0100)]
Merge branch 'master' into dev
Guillaume Pellerin [Fri, 7 Feb 2014 08:22:32 +0000 (09:22 +0100)]
Merge branch 'master' of github.com:yomguy/Telemeta
Guillaume Pellerin [Fri, 7 Feb 2014 08:02:24 +0000 (09:02 +0100)]
Merge pull request #6 from GitLaboratory/patch-1
Update setup.py
Guillaume Pellerin [Fri, 7 Feb 2014 08:02:10 +0000 (09:02 +0100)]
Merge pull request #7 from GitLaboratory/patch-2
Update setup.py
Il'ya A. Lykov [Thu, 6 Feb 2014 21:18:18 +0000 (04:18 +0700)]
Update setup.py
Il'ya A. Lykov [Thu, 6 Feb 2014 21:07:45 +0000 (04:07 +0700)]
Update setup.py
Guillaume Pellerin [Wed, 5 Feb 2014 00:43:57 +0000 (01:43 +0100)]
Cache: optimize file listing a little bit
Guillaume Pellerin [Tue, 4 Feb 2014 22:30:19 +0000 (23:30 +0100)]
add migr
Guillaume Pellerin [Tue, 4 Feb 2014 22:29:50 +0000 (23:29 +0100)]
fix migration numbers
Guillaume Pellerin [Tue, 4 Feb 2014 22:17:53 +0000 (23:17 +0100)]
admin: put related media, transcoded files and markers in item inlines
Guillaume Pellerin [Fri, 31 Jan 2014 22:49:12 +0000 (23:49 +0100)]
fix setup
Guillaume Pellerin [Fri, 31 Jan 2014 16:48:00 +0000 (17:48 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 29 Jan 2014 00:45:04 +0000 (01:45 +0100)]
regression on collection.doctype_code null value
Guillaume Pellerin [Wed, 29 Jan 2014 00:45:04 +0000 (01:45 +0100)]
regression on collection.doctype_code null value
Guillaume Pellerin [Mon, 27 Jan 2014 12:53:55 +0000 (13:53 +0100)]
update news and links
Guillaume Pellerin [Thu, 23 Jan 2014 08:54:02 +0000 (09:54 +0100)]
fix args
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:08 +0000 (23:10 +0100)]
back to jquery 1.6
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)]
fix path for import without copy
Guillaume Pellerin [Wed, 22 Jan 2014 13:28:54 +0000 (14:28 +0100)]
fix path
Guillaume Pellerin [Wed, 22 Jan 2014 13:24:54 +0000 (14:24 +0100)]
fix path
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
Guillaume Pellerin [Tue, 21 Jan 2014 13:48:22 +0000 (14:48 +0100)]
update requirements
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:49:43 +0000 (23:49 +0100)]
Merge branch 'dev' into crem2
Conflicts:
telemeta/views/collection.py
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:44:46 +0000 (23:44 +0100)]
dratically improve collection zip packaqe streaming thanks to zipstream
Guillaume Pellerin [Mon, 20 Jan 2014 22:08:33 +0000 (23:08 +0100)]
Merge branch 'dev' into crem2
Conflicts:
example/sandbox/settings.py
setup.py
telemeta/views/collection.py
telemeta/views/core.py
telemeta/views/item.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...'
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:41:00 +0000 (16:41 +0100)]
undo alt_ids exception for 'Sous-table...'
Guillaume Pellerin [Thu, 9 Jan 2014 15:15:46 +0000 (16:15 +0100)]
Merge branch 'crem2' into diadems
Guillaume Pellerin [Thu, 9 Jan 2014 15:15:36 +0000 (16:15 +0100)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Thu, 9 Jan 2014 15:15:17 +0000 (16:15 +0100)]
collection.doctype optional
Guillaume Pellerin [Thu, 9 Jan 2014 14:18:47 +0000 (15:18 +0100)]
Merge branch 'crem2' into diadems
Conflicts:
telemeta/models/media.py
Guillaume Pellerin [Thu, 9 Jan 2014 14:17:30 +0000 (15:17 +0100)]
Merge branch 'dev' into crem2
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 14:16:34 +0000 (15:16 +0100)]
set description_old
Guillaume Pellerin [Thu, 9 Jan 2014 12:10:05 +0000 (13:10 +0100)]
Merge branch 'crem2' into diadems
Guillaume Pellerin [Thu, 9 Jan 2014 12:09:41 +0000 (13:09 +0100)]
Merge branch 'dev' into crem2
Conflicts:
telemeta/models/media.py
telemeta/urls.py
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:57 +0000 (23:45 +0100)]
Merge branch 'crem2' into diadems
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:26:28 +0000 (22:26 +0100)]
Merge branch 'crem2' into diadems
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:14:31 +0000 (00:14 +0100)]
Merge branch 'crem2' into diadems
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
projects / telemeta.git / log