]>
git.parisson.com Git - telemeta.git/log
yomguy [Mon, 17 Sep 2012 16:22:25 +0000 (18:22 +0200)]
Merge branch 'dev' into lam
yomguy [Mon, 17 Sep 2012 16:22:06 +0000 (18:22 +0200)]
add static again
yomguy [Mon, 17 Sep 2012 16:11:05 +0000 (18:11 +0200)]
Merge branch 'dev' into lam
yomguy [Mon, 17 Sep 2012 16:10:57 +0000 (18:10 +0200)]
add static
yomguy [Mon, 17 Sep 2012 16:09:21 +0000 (18:09 +0200)]
Merge branch 'dev' into lam
yomguy [Mon, 17 Sep 2012 16:08:56 +0000 (18:08 +0200)]
fix images, timeside to static
yomguy [Mon, 17 Sep 2012 16:02:55 +0000 (18:02 +0200)]
cleanup and static libs
yomguy [Mon, 17 Sep 2012 15:23:22 +0000 (17:23 +0200)]
Merge branch 'dev' into lam
yomguy [Mon, 17 Sep 2012 15:11:39 +0000 (17:11 +0200)]
more static
yomguy [Mon, 17 Sep 2012 13:09:37 +0000 (15:09 +0200)]
add lam logo
yomguy [Mon, 17 Sep 2012 13:05:31 +0000 (15:05 +0200)]
add static
yomguy [Mon, 17 Sep 2012 12:49:43 +0000 (14:49 +0200)]
Merge branch 'master' into lam
Conflicts:
telemeta/locale/fr/LC_MESSAGES/django.po
yomguy [Mon, 17 Sep 2012 12:47:30 +0000 (14:47 +0200)]
Merge branch 'dev'
yomguy [Mon, 17 Sep 2012 12:46:11 +0000 (14:46 +0200)]
cleanup
yomguy [Mon, 17 Sep 2012 12:44:00 +0000 (14:44 +0200)]
add migr
yomguy [Mon, 17 Sep 2012 12:43:02 +0000 (14:43 +0200)]
split web.base into views.*
yomguy [Mon, 17 Sep 2012 11:08:33 +0000 (13:08 +0200)]
add send_file filewrapper for various exports
yomguy [Wed, 12 Sep 2012 10:06:48 +0000 (12:06 +0200)]
add webm mimetype
yomguy [Fri, 20 Jul 2012 08:53:07 +0000 (10:53 +0200)]
Merge branch 'dev'
yomguy [Fri, 20 Jul 2012 08:52:46 +0000 (10:52 +0200)]
add migr
yomguy [Fri, 20 Jul 2012 08:50:12 +0000 (10:50 +0200)]
Merge branch 'release/1.4.4' into dev
Conflicts:
telemeta/models/media.py
yomguy [Fri, 20 Jul 2012 08:49:01 +0000 (10:49 +0200)]
Merge branch 'release/1.4.4'
yomguy [Wed, 18 Jul 2012 13:40:49 +0000 (15:40 +0200)]
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
yomguy [Wed, 18 Jul 2012 13:40:15 +0000 (15:40 +0200)]
add max_length=255 to related media
yomguy [Tue, 17 Jul 2012 23:00:32 +0000 (01:00 +0200)]
item.file max_length=255
yomguy [Mon, 9 Jul 2012 11:42:59 +0000 (13:42 +0200)]
Merge branch 'dev'
yomguy [Mon, 9 Jul 2012 11:42:22 +0000 (13:42 +0200)]
add tag to test if app in installed
yomguy [Sun, 8 Jul 2012 23:21:03 +0000 (01:21 +0200)]
trans
yomguy [Sun, 8 Jul 2012 23:20:40 +0000 (01:20 +0200)]
Merge branch 'hotfix/registration' into dev
Conflicts:
telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/de/LC_MESSAGES/djangojs.po
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/django.po
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.po
yomguy [Sun, 8 Jul 2012 23:18:05 +0000 (01:18 +0200)]
Merge branch 'hotfix/registration'
yomguy [Sun, 8 Jul 2012 23:17:33 +0000 (01:17 +0200)]
fix some translations for registration process
yomguy [Sun, 8 Jul 2012 17:40:29 +0000 (19:40 +0200)]
fix unicodes, fix colors, cleanup, add new player view (contour, white bg), add old (awdio) cgi process
yomguy [Thu, 7 Jun 2012 08:14:49 +0000 (10:14 +0200)]
Merge branch 'dev' into lam
Conflicts:
telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/de/LC_MESSAGES/djangojs.po
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
yomguy [Thu, 7 Jun 2012 08:11:44 +0000 (10:11 +0200)]
locale
yomguy [Thu, 7 Jun 2012 08:10:49 +0000 (10:10 +0200)]
fix date
yomguy [Thu, 7 Jun 2012 08:06:04 +0000 (10:06 +0200)]
Merge branch 'dev' into lam
Conflicts:
telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/de/LC_MESSAGES/djangojs.po
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/django.po
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.po
yomguy [Thu, 7 Jun 2012 08:02:50 +0000 (10:02 +0200)]
fix trans
yomguy [Thu, 7 Jun 2012 07:59:51 +0000 (09:59 +0200)]
Subject to Topic, add user black icon
yomguy [Thu, 31 May 2012 23:28:48 +0000 (01:28 +0200)]
Merge branch 'release/1.4.4' into lam
Conflicts:
telemeta/templates/telemeta/mediaitem_detail.html
yomguy [Thu, 31 May 2012 23:25:30 +0000 (01:25 +0200)]
fix bug for item marker url, add <hr> to item edit
yomguy [Thu, 31 May 2012 21:33:34 +0000 (23:33 +0200)]
update changelog again
yomguy [Thu, 31 May 2012 21:29:36 +0000 (23:29 +0200)]
remove item general infos
yomguy [Thu, 31 May 2012 21:26:00 +0000 (23:26 +0200)]
fix doc again
yomguy [Thu, 31 May 2012 21:24:58 +0000 (23:24 +0200)]
Merge branch 'dev'
yomguy [Thu, 31 May 2012 21:24:26 +0000 (23:24 +0200)]
fix doc
yomguy [Thu, 31 May 2012 20:32:18 +0000 (22:32 +0200)]
Merge branch 'master' into lam
yomguy [Thu, 31 May 2012 20:30:05 +0000 (22:30 +0200)]
Merge branch 'release/1.4.3-2'
yomguy [Thu, 31 May 2012 13:31:34 +0000 (15:31 +0200)]
fix trans again
yomguy [Thu, 31 May 2012 13:25:53 +0000 (15:25 +0200)]
fix trans again
yomguy [Thu, 31 May 2012 13:24:46 +0000 (15:24 +0200)]
fix trans
yomguy [Thu, 31 May 2012 13:23:25 +0000 (15:23 +0200)]
fix trans
yomguy [Thu, 31 May 2012 11:14:08 +0000 (13:14 +0200)]
fix legal notices
yomguy [Thu, 31 May 2012 10:44:43 +0000 (12:44 +0200)]
fix lam logo
yomguy [Thu, 31 May 2012 10:41:59 +0000 (12:41 +0200)]
fix logo & trans
yomguy [Wed, 30 May 2012 15:20:36 +0000 (17:20 +0200)]
update item template
yomguy [Wed, 30 May 2012 12:39:50 +0000 (14:39 +0200)]
fix lam logo
yomguy [Wed, 30 May 2012 12:37:52 +0000 (14:37 +0200)]
fix lam logo
yomguy [Wed, 30 May 2012 12:28:47 +0000 (14:28 +0200)]
add lam logo
yomguy [Wed, 30 May 2012 11:14:26 +0000 (13:14 +0200)]
fix tape speed
yomguy [Wed, 30 May 2012 09:46:20 +0000 (11:46 +0200)]
domain to subject
yomguy [Wed, 30 May 2012 09:37:44 +0000 (11:37 +0200)]
Merge branch 'develop' into lam
yomguy [Wed, 30 May 2012 09:37:33 +0000 (11:37 +0200)]
add domain enum
yomguy [Wed, 30 May 2012 08:28:21 +0000 (10:28 +0200)]
Merge branch 'develop' into lam
yomguy [Wed, 30 May 2012 08:27:44 +0000 (10:27 +0200)]
fix tape speed unit
yomguy [Sun, 27 May 2012 17:24:28 +0000 (19:24 +0200)]
Merge branch 'develop' into lam
Conflicts:
telemeta/templates/telemeta/mediaitem_detail.html
yomguy [Sun, 27 May 2012 17:11:44 +0000 (19:11 +0200)]
25 home revisions
yomguy [Fri, 25 May 2012 16:12:09 +0000 (18:12 +0200)]
begin lam item template
yomguy [Fri, 25 May 2012 16:01:53 +0000 (18:01 +0200)]
add element type for format
yomguy [Fri, 25 May 2012 15:54:52 +0000 (17:54 +0200)]
fiw format str
yomguy [Fri, 25 May 2012 15:31:23 +0000 (17:31 +0200)]
fix format import
yomguy [Fri, 25 May 2012 15:04:27 +0000 (17:04 +0200)]
fix trans
yomguy [Fri, 25 May 2012 14:50:12 +0000 (16:50 +0200)]
fix trans
yomguy [Fri, 25 May 2012 14:36:58 +0000 (16:36 +0200)]
reorganize many models, add various item fields, add enums, add migr and trans
yomguy [Fri, 25 May 2012 12:48:39 +0000 (14:48 +0200)]
fix hub
yomguy [Thu, 24 May 2012 14:42:38 +0000 (16:42 +0200)]
trans
yomguy [Thu, 24 May 2012 13:12:29 +0000 (15:12 +0200)]
fix format
yomguy [Thu, 24 May 2012 13:07:12 +0000 (15:07 +0200)]
fix physical format
yomguy [Tue, 22 May 2012 17:40:32 +0000 (19:40 +0200)]
fix physical format
yomguy [Tue, 22 May 2012 08:03:05 +0000 (10:03 +0200)]
fix trans, add enum for number of channels
yomguy [Mon, 21 May 2012 16:03:11 +0000 (18:03 +0200)]
add format form
yomguy [Mon, 21 May 2012 16:00:41 +0000 (18:00 +0200)]
fix format handling when adding new item
yomguy [Mon, 21 May 2012 15:59:19 +0000 (17:59 +0200)]
fix item copy with format
yomguy [Mon, 21 May 2012 15:43:59 +0000 (17:43 +0200)]
fix item add with format
yomguy [Mon, 21 May 2012 15:06:39 +0000 (17:06 +0200)]
fix item edit form with format
yomguy [Sat, 19 May 2012 06:47:07 +0000 (08:47 +0200)]
Merge branch 'master' of github.com:yomguy/Telemeta into develop
Guillaume Pellerin [Sat, 19 May 2012 06:43:31 +0000 (23:43 -0700)]
Merge pull request #2 from yoshco/patch-1
Update INSTALL.rst
yoshco [Fri, 18 May 2012 23:12:19 +0000 (02:12 +0300)]
Update INSTALL.rst
yomguy [Fri, 18 May 2012 20:52:06 +0000 (22:52 +0200)]
fix format, add migration
yomguy [Fri, 18 May 2012 09:45:04 +0000 (11:45 +0200)]
link format ti item
yomguy [Fri, 18 May 2012 09:35:20 +0000 (11:35 +0200)]
add __init__
yomguy [Fri, 18 May 2012 09:34:54 +0000 (11:34 +0200)]
fix
yomguy [Fri, 18 May 2012 09:34:27 +0000 (11:34 +0200)]
oops, format regression..
yomguy [Fri, 18 May 2012 09:31:20 +0000 (11:31 +0200)]
Merge branch 'new_branch_name' into develop
Conflicts:
telemeta/models/format.py
yomguy [Fri, 18 May 2012 09:28:45 +0000 (11:28 +0200)]
add item to format
yomguy [Fri, 18 May 2012 09:20:08 +0000 (11:20 +0200)]
add enum, migr, imgs..
yomguy [Wed, 16 May 2012 14:52:37 +0000 (16:52 +0200)]
add original format properties to item
yomguy [Fri, 4 May 2012 14:56:03 +0000 (16:56 +0200)]
Merge branch 'master' into develop
yomguy [Fri, 4 May 2012 14:54:34 +0000 (16:54 +0200)]
add static note icon
yomguy [Wed, 2 May 2012 14:33:40 +0000 (16:33 +0200)]
Merge branch 'master' into develop
yomguy [Wed, 2 May 2012 14:33:35 +0000 (16:33 +0200)]
fix
projects / telemeta.git / log