]>
git.parisson.com Git - telemeta.git/log
Guillaume Pellerin [Tue, 2 Oct 2012 13:31:02 +0000 (15:31 +0200)]
Merge branch 'dev' of /var/git/telemeta into dev
yomguy [Tue, 2 Oct 2012 13:28:17 +0000 (15:28 +0200)]
update doc
yomguy [Tue, 2 Oct 2012 12:30:32 +0000 (14:30 +0200)]
cleanup sandbox, update diagram
yomguy [Tue, 2 Oct 2012 12:19:03 +0000 (14:19 +0200)]
* delete timeside static files, please ADD 'timeside' to INSTALLED_APPS
* cleanup
yomguy [Tue, 2 Oct 2012 09:17:41 +0000 (11:17 +0200)]
fix view name
yomguy [Tue, 2 Oct 2012 08:59:21 +0000 (10:59 +0200)]
rm htdocs
yomguy [Mon, 1 Oct 2012 15:01:15 +0000 (17:01 +0200)]
fix other edit buttons
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 [Thu, 27 Sep 2012 02:40:30 +0000 (04:40 +0200)]
fix home players
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 [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
Guillaume Pellerin [Wed, 26 Sep 2012 11:35:36 +0000 (13:35 +0200)]
Merge branch 'dev' of /var/git/telemeta into dev
yomguy [Wed, 26 Sep 2012 11:21:29 +0000 (13:21 +0200)]
merge lam edit buttons and redirect
yomguy [Tue, 25 Sep 2012 12:40:29 +0000 (14:40 +0200)]
fix charfield size
yomguy [Tue, 25 Sep 2012 12:17:25 +0000 (14:17 +0200)]
fix locale
yomguy [Tue, 25 Sep 2012 12:06:17 +0000 (14:06 +0200)]
excluded fields in forms
Guillaume Pellerin [Mon, 24 Sep 2012 11:54:11 +0000 (13:54 +0200)]
Merge branch 'dev' of /var/git/telemeta into dev
yomguy [Mon, 24 Sep 2012 10:23:14 +0000 (12:23 +0200)]
fix bad migrations
Guillaume Pellerin [Thu, 20 Sep 2012 16:34:34 +0000 (18:34 +0200)]
Merge branch 'dev' of /var/git/telemeta into dev
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
Guillaume Pellerin [Thu, 20 Sep 2012 15:37:40 +0000 (17:37 +0200)]
Merge branch 'dev' of /var/git/telemeta into dev
yomguy [Thu, 20 Sep 2012 15:36:01 +0000 (17:36 +0200)]
fix bad file field
Guillaume Pellerin [Thu, 20 Sep 2012 14:55:58 +0000 (16:55 +0200)]
Merge branch 'dev' of /var/git/telemeta into dev
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'
Guillaume Pellerin [Thu, 20 Sep 2012 14:28:19 +0000 (16:28 +0200)]
Merge branch 'dev' of /var/git/telemeta into dev
yomguy [Thu, 20 Sep 2012 14:27:03 +0000 (16:27 +0200)]
fix admin static urls
Guillaume Pellerin [Mon, 17 Sep 2012 16:50:21 +0000 (18:50 +0200)]
Merge branch 'dev' of /var/git/telemeta into dev
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:07 +0000 (18:43 +0200)]
finally fix image static
yomguy [Mon, 17 Sep 2012 16:22:06 +0000 (18:22 +0200)]
add static again
yomguy [Mon, 17 Sep 2012 16:10:57 +0000 (18:10 +0200)]
add static
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: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: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
Guillaume Pellerin [Fri, 20 Jul 2012 08:55:25 +0000 (10:55 +0200)]
Merge branch 'dev' of /var/git/telemeta into dev
yomguy [Fri, 20 Jul 2012 08:53:07 +0000 (10:53 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 20 Jul 2012 08:52:57 +0000 (10:52 +0200)]
Merge branch 'master' of /var/git/telemeta into 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:11:44 +0000 (10:11 +0200)]
locale
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: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:30:05 +0000 (22:30 +0200)]
Merge branch 'release/1.4.3-2'
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
projects / telemeta.git / log