]>
git.parisson.com Git - teleforma.git/log
Guillaume Pellerin [Fri, 20 Jul 2012 18:22:53 +0000 (20:22 +0200)]
Merge branch 'master' of /var/git/teleforma
Guillaume Pellerin [Fri, 20 Jul 2012 18:21:40 +0000 (20:21 +0200)]
Merge branch 'master' of /var/git/teleforma
yomguy [Fri, 20 Jul 2012 18:20:42 +0000 (20:20 +0200)]
regr
yomguy [Fri, 20 Jul 2012 18:19:20 +0000 (20:19 +0200)]
fix no mime type
Guillaume Pellerin [Fri, 20 Jul 2012 17:44:42 +0000 (19:44 +0200)]
Merge branch 'master' of /var/git/teleforma
Guillaume Pellerin [Fri, 20 Jul 2012 17:44:27 +0000 (19:44 +0200)]
no STOP button if not telecaster
yomguy [Fri, 20 Jul 2012 17:41:32 +0000 (19:41 +0200)]
no conf creation
yomguy [Thu, 19 Jul 2012 20:53:20 +0000 (22:53 +0200)]
fix course type
yomguy [Thu, 19 Jul 2012 20:50:34 +0000 (22:50 +0200)]
add conference sub objects, ignore archives for server when push
yomguy [Thu, 19 Jul 2012 20:15:13 +0000 (22:15 +0200)]
Merge branch 'hotfix/0.7.1-dev' into dev
yomguy [Thu, 19 Jul 2012 20:08:11 +0000 (22:08 +0200)]
fix path
yomguy [Thu, 19 Jul 2012 20:07:24 +0000 (22:07 +0200)]
fix path
yomguy [Thu, 19 Jul 2012 20:06:36 +0000 (22:06 +0200)]
fix path
yomguy [Thu, 19 Jul 2012 20:05:37 +0000 (22:05 +0200)]
fix host again
yomguy [Thu, 19 Jul 2012 20:00:37 +0000 (22:00 +0200)]
fix get_host
yomguy [Thu, 19 Jul 2012 19:57:21 +0000 (21:57 +0200)]
fix localhost for monitoring conference
yomguy [Thu, 19 Jul 2012 19:15:37 +0000 (21:15 +0200)]
Merge branch 'release/0.7-dev'
yomguy [Thu, 19 Jul 2012 19:15:05 +0000 (21:15 +0200)]
goto 0.7dev
yomguy [Thu, 19 Jul 2012 18:46:41 +0000 (20:46 +0200)]
fix footer
yomguy [Thu, 19 Jul 2012 18:44:34 +0000 (20:44 +0200)]
fix footer
yomguy [Thu, 19 Jul 2012 18:43:20 +0000 (20:43 +0200)]
fix footer
yomguy [Thu, 19 Jul 2012 18:42:48 +0000 (20:42 +0200)]
fix footer
yomguy [Thu, 19 Jul 2012 18:41:34 +0000 (20:41 +0200)]
fix footer
yomguy [Thu, 19 Jul 2012 18:39:46 +0000 (20:39 +0200)]
fix footer
yomguy [Thu, 19 Jul 2012 18:38:25 +0000 (20:38 +0200)]
fix footer
yomguy [Thu, 19 Jul 2012 18:36:16 +0000 (20:36 +0200)]
fix footer
yomguy [Thu, 19 Jul 2012 18:35:37 +0000 (20:35 +0200)]
fix footer
yomguy [Thu, 19 Jul 2012 18:34:49 +0000 (20:34 +0200)]
fix footer
yomguy [Thu, 19 Jul 2012 18:25:17 +0000 (20:25 +0200)]
bold status
yomguy [Thu, 19 Jul 2012 17:12:23 +0000 (19:12 +0200)]
no debug
yomguy [Thu, 19 Jul 2012 17:11:33 +0000 (19:11 +0200)]
debug again
yomguy [Thu, 19 Jul 2012 17:10:28 +0000 (19:10 +0200)]
debug again
yomguy [Thu, 19 Jul 2012 17:05:38 +0000 (19:05 +0200)]
no debug
yomguy [Thu, 19 Jul 2012 16:30:16 +0000 (18:30 +0200)]
fix type display style
yomguy [Thu, 19 Jul 2012 16:29:29 +0000 (18:29 +0200)]
fix type display style
yomguy [Thu, 19 Jul 2012 16:28:40 +0000 (18:28 +0200)]
fix type display style
yomguy [Thu, 19 Jul 2012 16:27:54 +0000 (18:27 +0200)]
fix type display style
yomguy [Thu, 19 Jul 2012 16:27:30 +0000 (18:27 +0200)]
fix type display style
yomguy [Thu, 19 Jul 2012 16:24:31 +0000 (18:24 +0200)]
fix type display style
yomguy [Thu, 19 Jul 2012 16:19:58 +0000 (18:19 +0200)]
fix type display style
yomguy [Thu, 19 Jul 2012 16:15:09 +0000 (18:15 +0200)]
fix display type
yomguy [Thu, 19 Jul 2012 16:12:28 +0000 (18:12 +0200)]
fix display type
yomguy [Thu, 19 Jul 2012 16:07:52 +0000 (18:07 +0200)]
fix import type
yomguy [Thu, 19 Jul 2012 16:05:56 +0000 (18:05 +0200)]
fix import type
yomguy [Thu, 19 Jul 2012 16:05:30 +0000 (18:05 +0200)]
fix import type
yomguy [Thu, 19 Jul 2012 16:02:17 +0000 (18:02 +0200)]
fix import type
yomguy [Thu, 19 Jul 2012 16:01:06 +0000 (18:01 +0200)]
fix import type
yomguy [Thu, 19 Jul 2012 15:59:56 +0000 (17:59 +0200)]
fix media list
yomguy [Thu, 19 Jul 2012 15:52:32 +0000 (17:52 +0200)]
fix import type
yomguy [Thu, 19 Jul 2012 15:48:46 +0000 (17:48 +0200)]
fix audio button
yomguy [Thu, 19 Jul 2012 15:48:16 +0000 (17:48 +0200)]
fix audio button
yomguy [Thu, 19 Jul 2012 15:44:51 +0000 (17:44 +0200)]
fix audio button
yomguy [Thu, 19 Jul 2012 15:44:04 +0000 (17:44 +0200)]
fix audio button
yomguy [Thu, 19 Jul 2012 15:42:42 +0000 (17:42 +0200)]
add audio button on media view
yomguy [Thu, 19 Jul 2012 14:29:30 +0000 (16:29 +0200)]
fix module style
yomguy [Thu, 19 Jul 2012 14:27:42 +0000 (16:27 +0200)]
fix module style
yomguy [Thu, 19 Jul 2012 14:19:46 +0000 (16:19 +0200)]
fix module style
yomguy [Thu, 19 Jul 2012 14:18:01 +0000 (16:18 +0200)]
fix module style
yomguy [Thu, 19 Jul 2012 14:06:28 +0000 (16:06 +0200)]
fix download button
yomguy [Thu, 19 Jul 2012 14:05:35 +0000 (16:05 +0200)]
try other download button
yomguy [Thu, 19 Jul 2012 14:01:48 +0000 (16:01 +0200)]
fix download button
yomguy [Thu, 19 Jul 2012 14:00:40 +0000 (16:00 +0200)]
fix download button
yomguy [Thu, 19 Jul 2012 13:58:16 +0000 (15:58 +0200)]
fix download button
yomguy [Thu, 19 Jul 2012 13:56:21 +0000 (15:56 +0200)]
fix download button
yomguy [Thu, 19 Jul 2012 13:55:53 +0000 (15:55 +0200)]
fix download button
yomguy [Thu, 19 Jul 2012 13:53:29 +0000 (15:53 +0200)]
fix download button
yomguy [Thu, 19 Jul 2012 13:52:43 +0000 (15:52 +0200)]
fix
yomguy [Thu, 19 Jul 2012 13:43:43 +0000 (15:43 +0200)]
fix download button
yomguy [Thu, 19 Jul 2012 13:41:32 +0000 (15:41 +0200)]
add download button
yomguy [Thu, 19 Jul 2012 13:31:31 +0000 (15:31 +0200)]
fix media metadata
yomguy [Thu, 19 Jul 2012 13:22:44 +0000 (15:22 +0200)]
img width
yomguy [Thu, 19 Jul 2012 13:18:39 +0000 (15:18 +0200)]
debug again..
yomguy [Thu, 19 Jul 2012 13:16:39 +0000 (15:16 +0200)]
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
Conflicts:
teleforma/management/commands/teleforma-import-conferences.py
yomguy [Thu, 19 Jul 2012 13:16:24 +0000 (15:16 +0200)]
debug again..
yomguy [Thu, 19 Jul 2012 11:50:58 +0000 (13:50 +0200)]
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
yomguy [Thu, 19 Jul 2012 11:50:50 +0000 (13:50 +0200)]
fix station desc
yomguy [Thu, 19 Jul 2012 11:50:15 +0000 (13:50 +0200)]
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
yomguy [Thu, 19 Jul 2012 11:50:05 +0000 (13:50 +0200)]
add cleanup
yomguy [Thu, 19 Jul 2012 11:49:02 +0000 (13:49 +0200)]
fix station desc
yomguy [Thu, 19 Jul 2012 00:37:24 +0000 (02:37 +0200)]
fix
yomguy [Thu, 19 Jul 2012 00:30:57 +0000 (02:30 +0200)]
no audio on desk
yomguy [Thu, 19 Jul 2012 00:30:26 +0000 (02:30 +0200)]
no audio on desk
yomguy [Thu, 19 Jul 2012 00:28:26 +0000 (02:28 +0200)]
debug
yomguy [Thu, 19 Jul 2012 00:23:02 +0000 (02:23 +0200)]
debug
yomguy [Wed, 18 Jul 2012 23:13:48 +0000 (01:13 +0200)]
no debug
yomguy [Wed, 18 Jul 2012 23:13:23 +0000 (01:13 +0200)]
debug
yomguy [Wed, 18 Jul 2012 23:12:28 +0000 (01:12 +0200)]
fic snapshot
yomguy [Wed, 18 Jul 2012 23:09:05 +0000 (01:09 +0200)]
fic snapshot
yomguy [Wed, 18 Jul 2012 23:06:53 +0000 (01:06 +0200)]
debug
yomguy [Wed, 18 Jul 2012 23:04:20 +0000 (01:04 +0200)]
debug
yomguy [Wed, 18 Jul 2012 22:59:12 +0000 (00:59 +0200)]
debug
yomguy [Wed, 18 Jul 2012 22:50:47 +0000 (00:50 +0200)]
rm room for record
yomguy [Wed, 18 Jul 2012 22:48:50 +0000 (00:48 +0200)]
debug
yomguy [Wed, 18 Jul 2012 22:44:54 +0000 (00:44 +0200)]
fix status again
yomguy [Wed, 18 Jul 2012 22:43:36 +0000 (00:43 +0200)]
fix status
yomguy [Wed, 18 Jul 2012 22:41:23 +0000 (00:41 +0200)]
fix status
yomguy [Wed, 18 Jul 2012 22:40:27 +0000 (00:40 +0200)]
fix status
yomguy [Wed, 18 Jul 2012 22:35:14 +0000 (00:35 +0200)]
cleanup js
yomguy [Wed, 18 Jul 2012 22:25:57 +0000 (00:25 +0200)]
fic module
yomguy [Wed, 18 Jul 2012 22:23:20 +0000 (00:23 +0200)]
fix no telecaster
projects / teleforma.git / log