]>
git.parisson.com Git - telemeta.git/log
yomguy [Mon, 1 Oct 2012 13:07:46 +0000 (15:07 +0200)]
Merge branch 'dev' into lam
Conflicts:
telemeta/templates/telemeta/mediaitem_detail.html
telemeta/views/item.py
yomguy [Mon, 1 Oct 2012 13:02:51 +0000 (15:02 +0200)]
fix more redirects
yomguy [Mon, 1 Oct 2012 12:46:12 +0000 (14:46 +0200)]
fix resource edit buttons and links, fix many redirect links in views
yomguy [Fri, 28 Sep 2012 15:21:51 +0000 (17:21 +0200)]
fix locale, fold blocks on item detail
yomguy [Thu, 27 Sep 2012 02:43:51 +0000 (04:43 +0200)]
+1
yomguy [Thu, 27 Sep 2012 02:42:51 +0000 (04:42 +0200)]
add pub sound
yomguy [Thu, 27 Sep 2012 02:40:30 +0000 (04:40 +0200)]
fix home players
yomguy [Thu, 27 Sep 2012 02:40:03 +0000 (04:40 +0200)]
fix home players
yomguy [Thu, 27 Sep 2012 02:31:26 +0000 (04:31 +0200)]
rounding
yomguy [Thu, 27 Sep 2012 02:30:35 +0000 (04:30 +0200)]
rounding home
yomguy [Thu, 27 Sep 2012 01:45:30 +0000 (03:45 +0200)]
merge fixes from lam against timeside 0.4.0-a
yomguy [Thu, 27 Sep 2012 01:00:36 +0000 (03:00 +0200)]
fix analyzers
yomguy [Thu, 27 Sep 2012 00:29:34 +0000 (02:29 +0200)]
fix decoder properties for analyzing against timeside gst branch
yomguy [Wed, 26 Sep 2012 19:11:24 +0000 (21:11 +0200)]
cleanup
yomguy [Wed, 26 Sep 2012 16:22:23 +0000 (18:22 +0200)]
fix streamer
yomguy [Wed, 26 Sep 2012 15:19:19 +0000 (17:19 +0200)]
simplify streamer
yomguy [Wed, 26 Sep 2012 14:32:25 +0000 (16:32 +0200)]
fix metadata during stream
yomguy [Wed, 26 Sep 2012 12:46:23 +0000 (14:46 +0200)]
fix metadata
yomguy [Wed, 26 Sep 2012 12:08:57 +0000 (14:08 +0200)]
fix encoder frames
yomguy [Wed, 26 Sep 2012 11:33:35 +0000 (13:33 +0200)]
locale
yomguy [Wed, 26 Sep 2012 11:21:29 +0000 (13:21 +0200)]
merge lam edit buttons and redirect
yomguy [Wed, 26 Sep 2012 11:20:31 +0000 (13:20 +0200)]
fix edit buttons and redirect
yomguy [Wed, 26 Sep 2012 10:09:43 +0000 (12:09 +0200)]
fix item edit, add, copy buttons and forms
yomguy [Tue, 25 Sep 2012 12:46:02 +0000 (14:46 +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 [Tue, 25 Sep 2012 12:40:29 +0000 (14:40 +0200)]
fix charfield size
yomguy [Tue, 25 Sep 2012 12:32:24 +0000 (14:32 +0200)]
fix double old_code, add keywords
yomguy [Tue, 25 Sep 2012 12:25:20 +0000 (14:25 +0200)]
locale again
yomguy [Tue, 25 Sep 2012 12:17:25 +0000 (14:17 +0200)]
fix locale
yomguy [Tue, 25 Sep 2012 12:14:19 +0000 (14:14 +0200)]
Merge branch 'dev' into lam
Conflicts:
telemeta/forms/media.py
telemeta/templates/telemeta/mediaitem_edit.html
yomguy [Tue, 25 Sep 2012 12:06:17 +0000 (14:06 +0200)]
excluded fields in forms
yomguy [Tue, 25 Sep 2012 10:26:18 +0000 (12:26 +0200)]
fix fr lam locale
yomguy [Tue, 25 Sep 2012 10:22:07 +0000 (12:22 +0200)]
again for fr
yomguy [Tue, 25 Sep 2012 10:17:01 +0000 (12:17 +0200)]
update trans
yomguy [Tue, 25 Sep 2012 10:12:46 +0000 (12:12 +0200)]
Merge branch 'dev' into lam
yomguy [Mon, 24 Sep 2012 10:23:14 +0000 (12:23 +0200)]
fix bad migrations
yomguy [Thu, 20 Sep 2012 16:18:45 +0000 (18:18 +0200)]
add migr
yomguy [Thu, 20 Sep 2012 16:16:33 +0000 (18:16 +0200)]
fix filename length
yomguy [Thu, 20 Sep 2012 15:36:01 +0000 (17:36 +0200)]
fix bad file field
yomguy [Thu, 20 Sep 2012 14:53:29 +0000 (16:53 +0200)]
fix admin css
yomguy [Thu, 20 Sep 2012 14:33:45 +0000 (16:33 +0200)]
Merge branch 'dev'
yomguy [Thu, 20 Sep 2012 14:27:03 +0000 (16:27 +0200)]
fix admin static urls
yomguy [Mon, 17 Sep 2012 23:48:26 +0000 (01:48 +0200)]
fix some fields, begin field filtering
yomguy [Mon, 17 Sep 2012 16:48:37 +0000 (18:48 +0200)]
fix logo
yomguy [Mon, 17 Sep 2012 16:48:03 +0000 (18:48 +0200)]
Merge branch 'master' into lam
yomguy [Mon, 17 Sep 2012 16:47:53 +0000 (18:47 +0200)]
Merge branch 'dev'
yomguy [Mon, 17 Sep 2012 16:47:13 +0000 (18:47 +0200)]
original logo
yomguy [Mon, 17 Sep 2012 16:45:46 +0000 (18:45 +0200)]
Merge branch 'dev'
yomguy [Mon, 17 Sep 2012 16:43:32 +0000 (18:43 +0200)]
Merge branch 'dev' into lam
yomguy [Mon, 17 Sep 2012 16:43:07 +0000 (18:43 +0200)]
finally fix image static
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
projects / telemeta.git / log