]>
git.parisson.com Git - telemeta.git/log
yomguy [Mon, 5 Dec 2011 08:16:34 +0000 (09:16 +0100)]
Merge branch 'master' into crem
yomguy [Mon, 5 Dec 2011 08:16:22 +0000 (09:16 +0100)]
add links to titles
yomguy [Mon, 5 Dec 2011 08:05:47 +0000 (09:05 +0100)]
Merge branch 'master' into crem
yomguy [Sun, 4 Dec 2011 22:46:31 +0000 (23:46 +0100)]
fix install doc and deps
yomguy [Thu, 1 Dec 2011 17:04:11 +0000 (18:04 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 1 Dec 2011 17:03:59 +0000 (18:03 +0100)]
fix manifest
yomguy [Thu, 1 Dec 2011 17:02:32 +0000 (18:02 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 1 Dec 2011 17:02:22 +0000 (18:02 +0100)]
fix manifest again
yomguy [Thu, 1 Dec 2011 16:59:44 +0000 (17:59 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 1 Dec 2011 16:59:06 +0000 (17:59 +0100)]
fix excluded dirs
yomguy [Thu, 1 Dec 2011 16:45:18 +0000 (17:45 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 1 Dec 2011 16:44:20 +0000 (17:44 +0100)]
add some dependencies, fix some infos, tag 1.3
yomguy [Thu, 1 Dec 2011 13:41:56 +0000 (14:41 +0100)]
import: fix item save
yomguy [Thu, 1 Dec 2011 13:40:56 +0000 (14:40 +0100)]
import: fix item save
yomguy [Thu, 1 Dec 2011 10:02:01 +0000 (11:02 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 1 Dec 2011 10:01:27 +0000 (11:01 +0100)]
copy keywords and performances when copying item
yomguy [Thu, 1 Dec 2011 09:37:18 +0000 (10:37 +0100)]
fix collection add, item copy and add
yomguy [Wed, 30 Nov 2011 14:42:33 +0000 (15:42 +0100)]
Merge branch 'master' into crem
yomguy [Wed, 30 Nov 2011 14:42:08 +0000 (15:42 +0100)]
add sound filter to search results
yomguy [Wed, 30 Nov 2011 12:24:29 +0000 (13:24 +0100)]
Merge branch 'master' into crem
yomguy [Wed, 30 Nov 2011 12:22:53 +0000 (13:22 +0100)]
add vertical scroll bar for markers
yomguy [Wed, 30 Nov 2011 11:39:13 +0000 (12:39 +0100)]
Merge branch 'master' into crem
yomguy [Wed, 30 Nov 2011 11:37:57 +0000 (12:37 +0100)]
add ipauth infos to auto login IP ranges of machines, fix various install infos (closes #86)
yomguy [Wed, 30 Nov 2011 10:52:29 +0000 (11:52 +0100)]
Merge branch 'master' into crem
yomguy [Wed, 30 Nov 2011 10:46:33 +0000 (11:46 +0100)]
search: add sound filter checkbox (closes #91)
yomguy [Wed, 30 Nov 2011 10:34:53 +0000 (11:34 +0100)]
Merge branch 'master' into crem
yomguy [Wed, 30 Nov 2011 10:33:35 +0000 (11:33 +0100)]
fix sound collection list
yomguy [Wed, 30 Nov 2011 10:25:53 +0000 (11:25 +0100)]
bugfix
yomguy [Wed, 30 Nov 2011 10:24:43 +0000 (11:24 +0100)]
fix computed duration with no .
yomguy [Wed, 30 Nov 2011 10:07:26 +0000 (11:07 +0100)]
cleanup
yomguy [Wed, 30 Nov 2011 10:06:44 +0000 (11:06 +0100)]
Merge branch 'master' into crem
Conflicts:
telemeta/models/media.py
yomguy [Wed, 30 Nov 2011 10:03:51 +0000 (11:03 +0100)]
collections: related media before items
yomguy [Wed, 30 Nov 2011 09:59:11 +0000 (10:59 +0100)]
add "Sound" filter to collection list
yomguy [Wed, 30 Nov 2011 09:25:24 +0000 (10:25 +0100)]
make global MediaRelated abstract
yomguy [Wed, 30 Nov 2011 09:20:39 +0000 (10:20 +0100)]
add templates for related
yomguy [Wed, 30 Nov 2011 09:18:32 +0000 (10:18 +0100)]
separate forms, add MediaCollectionRelated (but have to make an abstract object for related media), fix keyword form
yomguy [Tue, 29 Nov 2011 09:06:29 +0000 (10:06 +0100)]
add test for import with no file upload
yomguy [Tue, 29 Nov 2011 09:03:52 +0000 (10:03 +0100)]
Merge branch 'master' into crem
yomguy [Tue, 29 Nov 2011 09:03:31 +0000 (10:03 +0100)]
cleanup
yomguy [Mon, 28 Nov 2011 22:02:59 +0000 (23:02 +0100)]
Merge branch 'master' into crem
Conflicts:
telemeta/models/media.py
yomguy [Mon, 28 Nov 2011 22:00:40 +0000 (23:00 +0100)]
add collection to corpus relation
yomguy [Mon, 28 Nov 2011 16:43:42 +0000 (17:43 +0100)]
Merge branch 'master' into crem
Conflicts:
telemeta/models/media.py
yomguy [Mon, 28 Nov 2011 16:40:20 +0000 (17:40 +0100)]
templates: add credits to item related media
yomguy [Mon, 28 Nov 2011 16:35:35 +0000 (17:35 +0100)]
edit: fix various field display conditions, closes #81
model: add MediaCorpus, add credits to MediaItemRelated
yomguy [Mon, 28 Nov 2011 10:09:06 +0000 (11:09 +0100)]
Merge branch 'master' into crem
yomguy [Sat, 26 Nov 2011 15:03:07 +0000 (16:03 +0100)]
analysis: cut duration to milliseconds
yomguy [Thu, 24 Nov 2011 11:42:01 +0000 (12:42 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 24 Nov 2011 11:41:36 +0000 (12:41 +0100)]
import crem: strip item CSV codes
yomguy [Thu, 24 Nov 2011 10:42:42 +0000 (11:42 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 24 Nov 2011 10:41:22 +0000 (11:41 +0100)]
player: update SM2 swf files, use flash by default (HTML5 playing working the cursor hangs when seeking)
yomguy [Thu, 24 Nov 2011 10:25:24 +0000 (11:25 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 24 Nov 2011 10:19:44 +0000 (11:19 +0100)]
player: try html5, update soundmanager2 to 2.97a.
20111030
yomguy [Fri, 18 Nov 2011 14:08:08 +0000 (15:08 +0100)]
Merge branch 'master' into crem
yomguy [Fri, 18 Nov 2011 14:07:54 +0000 (15:07 +0100)]
import crem: fix msg
yomguy [Fri, 18 Nov 2011 14:00:49 +0000 (15:00 +0100)]
Merge branch 'master' into crem
yomguy [Fri, 18 Nov 2011 14:00:33 +0000 (15:00 +0100)]
crem import: fix old_ref
yomguy [Fri, 18 Nov 2011 13:24:29 +0000 (14:24 +0100)]
Merge branch 'master' into crem
yomguy [Fri, 18 Nov 2011 13:24:15 +0000 (14:24 +0100)]
import crem: add urls to log
yomguy [Fri, 18 Nov 2011 13:06:38 +0000 (14:06 +0100)]
Merge branch 'master' into crem
yomguy [Fri, 18 Nov 2011 13:06:27 +0000 (14:06 +0100)]
import crem: bugfix
yomguy [Fri, 18 Nov 2011 12:55:37 +0000 (13:55 +0100)]
Merge branch 'master' into crem
yomguy [Fri, 18 Nov 2011 12:55:25 +0000 (13:55 +0100)]
crem import: bugfix
yomguy [Fri, 18 Nov 2011 12:16:22 +0000 (13:16 +0100)]
Merge branch 'master' into crem
yomguy [Fri, 18 Nov 2011 12:15:23 +0000 (13:15 +0100)]
collection edit: fix null doc_type
import crem: add special cases, simplify
yomguy [Thu, 17 Nov 2011 13:11:49 +0000 (14:11 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 17 Nov 2011 13:11:16 +0000 (14:11 +0100)]
import: bugfix
yomguy [Thu, 17 Nov 2011 12:37:48 +0000 (13:37 +0100)]
import: bugfix
yomguy [Thu, 17 Nov 2011 12:01:37 +0000 (13:01 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 17 Nov 2011 12:00:14 +0000 (13:00 +0100)]
import: bugfix
yomguy [Thu, 17 Nov 2011 11:51:14 +0000 (12:51 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 17 Nov 2011 11:50:58 +0000 (12:50 +0100)]
cleanup
yomguy [Thu, 17 Nov 2011 11:46:26 +0000 (12:46 +0100)]
bugfix, cleanup
yomguy [Thu, 17 Nov 2011 11:40:35 +0000 (12:40 +0100)]
import: overwrite mode, create collections, more conditions
yomguy [Thu, 17 Nov 2011 09:04:15 +0000 (10:04 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 17 Nov 2011 09:03:46 +0000 (10:03 +0100)]
add user revision
yomguy [Thu, 17 Nov 2011 08:57:03 +0000 (09:57 +0100)]
Merge branch 'master' into crem
Conflicts:
telemeta/pages/en/home.rst
telemeta/pages/fr/home.rst
yomguy [Thu, 17 Nov 2011 08:54:28 +0000 (09:54 +0100)]
fix imports scripts
yomguy [Wed, 16 Nov 2011 16:37:50 +0000 (17:37 +0100)]
fix some cases in import scripts
yomguy [Wed, 16 Nov 2011 09:19:16 +0000 (10:19 +0100)]
fix descriptions
yomguy [Mon, 14 Nov 2011 14:19:56 +0000 (15:19 +0100)]
Merge branch 'master' into crem
yomguy [Mon, 14 Nov 2011 14:14:45 +0000 (15:14 +0100)]
fix collection hidden fields
yomguy [Mon, 14 Nov 2011 14:05:07 +0000 (15:05 +0100)]
Merge branch 'master' into crem
yomguy [Mon, 14 Nov 2011 12:31:22 +0000 (13:31 +0100)]
no more doctype_code
yomguy [Thu, 10 Nov 2011 15:10:28 +0000 (16:10 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 10 Nov 2011 14:59:33 +0000 (15:59 +0100)]
fix exported item metadata writing
yomguy [Thu, 10 Nov 2011 14:41:22 +0000 (15:41 +0100)]
cannot encode to FLAC and OGG for now, go to 1.3
yomguy [Thu, 10 Nov 2011 13:29:34 +0000 (14:29 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 10 Nov 2011 13:29:17 +0000 (14:29 +0100)]
fix trans
yomguy [Thu, 10 Nov 2011 13:02:18 +0000 (14:02 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 10 Nov 2011 13:01:18 +0000 (14:01 +0100)]
change item related "file" object denomination to "media"
yomguy [Thu, 10 Nov 2011 12:52:36 +0000 (13:52 +0100)]
display related media as dl fields
yomguy [Thu, 10 Nov 2011 11:38:04 +0000 (12:38 +0100)]
maximize related img preview
yomguy [Thu, 10 Nov 2011 11:32:19 +0000 (12:32 +0100)]
rename related media object
yomguy [Thu, 10 Nov 2011 11:02:05 +0000 (12:02 +0100)]
Merge branch 'master' into crem
yomguy [Thu, 10 Nov 2011 10:58:58 +0000 (11:58 +0100)]
order item lists of collections by code and old_code, add analytics block to base.html
yomguy [Fri, 4 Nov 2011 12:22:20 +0000 (13:22 +0100)]
fix titles again
yomguy [Fri, 4 Nov 2011 12:17:55 +0000 (13:17 +0100)]
fix page titles
yomguy [Fri, 4 Nov 2011 12:10:03 +0000 (13:10 +0100)]
cleanup
yomguy [Fri, 4 Nov 2011 11:46:48 +0000 (12:46 +0100)]
auto parsing youtube titles
yomguy [Fri, 4 Nov 2011 11:23:42 +0000 (12:23 +0100)]
add _blank targets
projects / telemeta.git / log