]>
git.parisson.com Git - telemeta.git/log
Guillaume Pellerin [Fri, 14 Nov 2014 00:15:27 +0000 (01:15 +0100)]
Merge branch 'crem' of git+ssh://vcs.parisson.com/var/git/telemeta into crem
Guillaume Pellerin [Fri, 14 Nov 2014 00:07:40 +0000 (01:07 +0100)]
finally fix an old bug on marker and cursor SVG height with a simple css rule (fix #98)
Guillaume Pellerin [Tue, 9 Sep 2014 20:33:54 +0000 (22:33 +0200)]
update homes, fix chinese home
Guillaume Pellerin [Tue, 2 Sep 2014 16:58:37 +0000 (18:58 +0200)]
Merge branch 'crem' of git.parisson.com:git/telemeta into crem
Guillaume Pellerin [Tue, 2 Sep 2014 16:58:24 +0000 (18:58 +0200)]
Merge branch 'dev' into crem
Guillaume Pellerin [Tue, 2 Sep 2014 16:57:57 +0000 (18:57 +0200)]
add en pages to zh_CN
Guillaume Pellerin [Tue, 2 Sep 2014 16:56:36 +0000 (18:56 +0200)]
Merge branch 'crem' of git.parisson.com:git/telemeta into crem
Guillaume Pellerin [Tue, 2 Sep 2014 16:56:06 +0000 (18:56 +0200)]
locales
Guillaume Pellerin [Tue, 2 Sep 2014 16:55:47 +0000 (18:55 +0200)]
Merge branch 'dev' into crem
Guillaume Pellerin [Tue, 2 Sep 2014 16:55:34 +0000 (18:55 +0200)]
add mo files
Guillaume Pellerin [Tue, 2 Sep 2014 15:51:52 +0000 (17:51 +0200)]
Merge branch 'crem' of git.parisson.com:git/telemeta into crem
Guillaume Pellerin [Tue, 2 Sep 2014 15:50:10 +0000 (17:50 +0200)]
locales
Guillaume Pellerin [Tue, 2 Sep 2014 15:49:51 +0000 (17:49 +0200)]
Merge branch 'dev' into crem
Guillaume Pellerin [Tue, 2 Sep 2014 15:48:22 +0000 (17:48 +0200)]
fix variables in CN translations
Guillaume Pellerin [Tue, 2 Sep 2014 15:39:39 +0000 (17:39 +0200)]
Merge branch 'dev' into crem
Guillaume Pellerin [Tue, 2 Sep 2014 14:23:23 +0000 (16:23 +0200)]
modify install tips, add chinese translations
Guillaume Pellerin [Sun, 20 Jul 2014 17:11:43 +0000 (19:11 +0200)]
add ajax sync method
Guillaume Pellerin [Sun, 20 Jul 2014 16:58:45 +0000 (18:58 +0200)]
fix
Guillaume Pellerin [Sun, 20 Jul 2014 16:56:51 +0000 (18:56 +0200)]
make ajax sync
Guillaume Pellerin [Thu, 3 Jul 2014 14:40:32 +0000 (16:40 +0200)]
Merge branch 'crem' of git.parisson.com:git/telemeta into crem
Guillaume Pellerin [Thu, 3 Jul 2014 14:40:00 +0000 (16:40 +0200)]
Merge branch 'dev' into crem
Guillaume Pellerin [Thu, 3 Jul 2014 14:39:40 +0000 (16:39 +0200)]
add Europenana sounds logo
Guillaume Pellerin [Thu, 3 Jul 2014 14:31:04 +0000 (16:31 +0200)]
update CREM home
Guillaume Pellerin [Tue, 1 Jul 2014 12:37:19 +0000 (14:37 +0200)]
add es locale
Guillaume Pellerin [Tue, 1 Jul 2014 12:34:29 +0000 (14:34 +0200)]
add zh_CN locale
Guillaume Pellerin [Wed, 4 Jun 2014 07:59:28 +0000 (09:59 +0200)]
Merge branch 'dev' into crem
Guillaume Pellerin [Wed, 4 Jun 2014 07:59:04 +0000 (09:59 +0200)]
update partner logos
Guillaume Pellerin [Wed, 28 May 2014 13:23:54 +0000 (15:23 +0200)]
Merge branch 'dev' into crem
Guillaume Pellerin [Wed, 28 May 2014 13:23:31 +0000 (15:23 +0200)]
Add download url for various related media resources
Guillaume Pellerin [Wed, 28 May 2014 13:08:20 +0000 (15:08 +0200)]
Merge branch 'dev' into crem
Guillaume Pellerin [Wed, 28 May 2014 13:07:54 +0000 (15:07 +0200)]
Fix collection related file download
Guillaume Pellerin [Wed, 28 May 2014 13:07:02 +0000 (15:07 +0200)]
Merge branch 'dev' into crem
Guillaume Pellerin [Wed, 28 May 2014 13:06:52 +0000 (15:06 +0200)]
Fix related media download
Guillaume Pellerin [Wed, 28 May 2014 13:03:35 +0000 (15:03 +0200)]
Merge branch 'dev' into crem
Guillaume Pellerin [Wed, 28 May 2014 13:02:53 +0000 (15:02 +0200)]
Direct download on related media page
Guillaume Pellerin [Wed, 28 May 2014 12:49:47 +0000 (14:49 +0200)]
Merge branch 'dev' into crem
Guillaume Pellerin [Tue, 27 May 2014 10:19:05 +0000 (12:19 +0200)]
Update timeside objects against 0.5.5
Guillaume Pellerin [Wed, 14 May 2014 22:32:38 +0000 (00:32 +0200)]
Merge branch 'dev' into crem
Guillaume Pellerin [Wed, 14 May 2014 21:56:21 +0000 (23:56 +0200)]
add generic user profile url (fix #171)
Guillaume Pellerin [Mon, 12 May 2014 14:01:06 +0000 (16:01 +0200)]
exclude kdenlive filters from fading
Guillaume Pellerin [Mon, 24 Mar 2014 12:51:16 +0000 (13:51 +0100)]
add related media download view - fix #156
Guillaume Pellerin [Thu, 20 Mar 2014 08:52:02 +0000 (09:52 +0100)]
fix travis setup again
Guillaume Pellerin [Thu, 20 Mar 2014 08:47:11 +0000 (09:47 +0100)]
cleanup setup for travis
Guillaume Pellerin [Thu, 20 Mar 2014 08:23:07 +0000 (09:23 +0100)]
add packages for travis
Guillaume Pellerin [Thu, 20 Mar 2014 08:08:16 +0000 (09:08 +0100)]
include zipstream in the package
Guillaume Pellerin [Wed, 19 Mar 2014 21:36:45 +0000 (22:36 +0100)]
Merge branch 'dev' into crem
Guillaume Pellerin [Wed, 19 Mar 2014 21:34:53 +0000 (22:34 +0100)]
bugfix
Guillaume Pellerin [Wed, 19 Mar 2014 21:31:18 +0000 (22:31 +0100)]
item files of collection zipstream packages get the item code instead of original code
Guillaume Pellerin [Mon, 17 Mar 2014 15:10:04 +0000 (16:10 +0100)]
update install info
Guillaume Pellerin [Mon, 17 Mar 2014 14:58:57 +0000 (15:58 +0100)]
cleanup install doc
Guillaume Pellerin [Wed, 12 Mar 2014 08:40:24 +0000 (09:40 +0100)]
pick item views from dev
Guillaume Pellerin [Wed, 5 Mar 2014 10:50:08 +0000 (11:50 +0100)]
Merge branch 'dev' into crem
Guillaume Pellerin [Wed, 5 Mar 2014 10:49:42 +0000 (11:49 +0100)]
fix resource children description list
Guillaume Pellerin [Mon, 3 Mar 2014 22:49:50 +0000 (23:49 +0100)]
Merge branch 'dev' into crem
Guillaume Pellerin [Mon, 3 Mar 2014 22:49:29 +0000 (23:49 +0100)]
simplify analyses call again
Guillaume Pellerin [Mon, 3 Mar 2014 22:49:18 +0000 (23:49 +0100)]
Merge branch 'dev' into crem
Conflicts:
telemeta/views/item.py
Guillaume Pellerin [Mon, 3 Mar 2014 22:47:43 +0000 (23:47 +0100)]
fix waveform grapher name change
Guillaume Pellerin [Mon, 3 Mar 2014 22:39:02 +0000 (23:39 +0100)]
get analyses by related name
Guillaume Pellerin [Mon, 3 Mar 2014 17:36:51 +0000 (18:36 +0100)]
fix external package url
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: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
projects / telemeta.git / log