]>
git.parisson.com Git - teleforma.git/log
yomguy [Tue, 17 Sep 2013 16:21:01 +0000 (18:21 +0200)]
Merge branch 'tc202' of git+ssh://vcs.parisson.com/var/git/teleforma into tc202
yomguy [Tue, 17 Sep 2013 16:20:49 +0000 (18:20 +0200)]
add random module
Guillaume Pellerin [Thu, 12 Sep 2013 07:37:41 +0000 (09:37 +0200)]
Merge branch 'crfpa' into tc202
Conflicts:
teleforma/locale/fr/LC_MESSAGES/django.mo
Guillaume Pellerin [Thu, 12 Sep 2013 07:15:03 +0000 (09:15 +0200)]
Merge branch 'crfpa' into icp
Guillaume Pellerin [Thu, 12 Sep 2013 07:13:32 +0000 (09:13 +0200)]
rm pro deps
Guillaume Pellerin [Mon, 9 Sep 2013 11:14:15 +0000 (13:14 +0200)]
auto nav height
Guillaume Pellerin [Mon, 9 Sep 2013 11:03:10 +0000 (13:03 +0200)]
fix long room title
Guillaume Pellerin [Fri, 23 Aug 2013 14:43:22 +0000 (16:43 +0200)]
fix prof names
Guillaume Pellerin [Tue, 6 Aug 2013 13:19:36 +0000 (15:19 +0200)]
fix prof unicode, prepare media pending view
Guillaume Pellerin [Sat, 27 Jul 2013 14:27:03 +0000 (16:27 +0200)]
redirect to home when no doc access
Guillaume Pellerin [Thu, 25 Jul 2013 20:48:48 +0000 (22:48 +0200)]
fix prints, locale
Guillaume Pellerin [Mon, 22 Jul 2013 19:42:49 +0000 (21:42 +0200)]
fix hosts
Guillaume Pellerin [Mon, 22 Jul 2013 13:27:44 +0000 (15:27 +0200)]
fix livestream str
yomguy [Mon, 22 Jul 2013 13:24:26 +0000 (15:24 +0200)]
Merge branch 'tc202' of git+ssh://vcs.parisson.com/var/git/teleforma into tc202
yomguy [Mon, 22 Jul 2013 13:20:16 +0000 (15:20 +0200)]
fix conf host
yomguy [Mon, 22 Jul 2013 12:20:39 +0000 (14:20 +0200)]
Merge branch 'tc202' of git+ssh://vcs.parisson.com/var/git/teleforma into tc202
Guillaume Pellerin [Mon, 22 Jul 2013 12:18:39 +0000 (14:18 +0200)]
Merge branch 'crfpa' into tc202
Conflicts:
teleforma/views/core.py
Guillaume Pellerin [Mon, 22 Jul 2013 12:17:53 +0000 (14:17 +0200)]
fix host ip
yomguy [Mon, 22 Jul 2013 11:49:30 +0000 (13:49 +0200)]
Merge branch 'tc202' of git+ssh://vcs.parisson.com/var/git/teleforma into tc202
Guillaume Pellerin [Mon, 22 Jul 2013 08:46:22 +0000 (10:46 +0200)]
Merge branch 'crfpa' into tc202
Conflicts:
teleforma/views/core.py
Guillaume Pellerin [Mon, 22 Jul 2013 08:45:40 +0000 (10:45 +0200)]
readd course form api
Guillaume Pellerin [Mon, 22 Jul 2013 08:42:42 +0000 (10:42 +0200)]
update push / pull methods
Guillaume Pellerin [Mon, 22 Jul 2013 07:57:19 +0000 (09:57 +0200)]
fix no period context
Guillaume Pellerin [Mon, 22 Jul 2013 07:41:58 +0000 (09:41 +0200)]
locale
Merge branch 'crfpa' into tc202
Conflicts:
teleforma/locale/fr/LC_MESSAGES/django.mo
Guillaume Pellerin [Mon, 22 Jul 2013 07:35:57 +0000 (09:35 +0200)]
rn rpc course list
Guillaume Pellerin [Sat, 20 Jul 2013 16:49:36 +0000 (18:49 +0200)]
fixup some conference and course syncs
Guillaume Pellerin [Fri, 19 Jul 2013 15:47:56 +0000 (17:47 +0200)]
fix no conf for livestream
Guillaume Pellerin [Fri, 19 Jul 2013 15:33:44 +0000 (17:33 +0200)]
fix snapshot url
Guillaume Pellerin [Fri, 19 Jul 2013 15:33:44 +0000 (17:33 +0200)]
fix snapshot url
Guillaume Pellerin [Fri, 19 Jul 2013 15:33:16 +0000 (17:33 +0200)]
add dep
Guillaume Pellerin [Fri, 19 Jul 2013 14:02:05 +0000 (16:02 +0200)]
locale
Guillaume Pellerin [Fri, 19 Jul 2013 13:59:43 +0000 (15:59 +0200)]
locale
yomguy [Fri, 19 Jul 2013 13:50:41 +0000 (15:50 +0200)]
Merge branch 'tc202' of git+ssh://vcs.parisson.com/var/git/teleforma into tc202
Guillaume Pellerin [Fri, 19 Jul 2013 13:35:24 +0000 (15:35 +0200)]
Merge branch 'crfpa' into tc202
Conflicts:
INSTALL.rst
Guillaume Pellerin [Fri, 19 Jul 2013 13:33:25 +0000 (15:33 +0200)]
except live message
Guillaume Pellerin [Thu, 18 Jul 2013 09:03:07 +0000 (11:03 +0200)]
add deps
Guillaume Pellerin [Wed, 17 Jul 2013 17:12:38 +0000 (19:12 +0200)]
Merge branch 'crfpa' into tc202
Conflicts:
teleforma/views/core.py
Guillaume Pellerin [Wed, 17 Jul 2013 17:11:59 +0000 (19:11 +0200)]
fix course pull
yomguy [Wed, 17 Jul 2013 16:16:05 +0000 (18:16 +0200)]
Merge branch 'tc202' of git+ssh://vcs.parisson.com/var/git/teleforma into tc202
Guillaume Pellerin [Wed, 17 Jul 2013 16:12:41 +0000 (18:12 +0200)]
fix conf push host
Guillaume Pellerin [Wed, 17 Jul 2013 16:13:33 +0000 (18:13 +0200)]
minor
Guillaume Pellerin [Wed, 17 Jul 2013 16:13:33 +0000 (18:13 +0200)]
minor
Guillaume Pellerin [Wed, 17 Jul 2013 16:12:41 +0000 (18:12 +0200)]
fix conf push host
yomguy [Wed, 17 Jul 2013 16:07:16 +0000 (18:07 +0200)]
Merge branch 'tc202' of git+ssh://vcs.parisson.com/var/git/teleforma into tc202
Guillaume Pellerin [Wed, 17 Jul 2013 16:06:06 +0000 (18:06 +0200)]
fix streaming
Guillaume Pellerin [Wed, 17 Jul 2013 15:45:32 +0000 (17:45 +0200)]
try to fix conf create
Guillaume Pellerin [Wed, 17 Jul 2013 14:04:13 +0000 (16:04 +0200)]
fix course pull
yomguy [Wed, 17 Jul 2013 13:58:47 +0000 (15:58 +0200)]
Merge branch 'tc202' of git+ssh://vcs.parisson.com/var/git/teleforma into tc202
Guillaume Pellerin [Wed, 17 Jul 2013 13:58:24 +0000 (15:58 +0200)]
add course pull command
yomguy [Wed, 17 Jul 2013 13:57:47 +0000 (15:57 +0200)]
Merge branch 'tc202' of git+ssh://vcs.parisson.com/var/git/teleforma into tc202
Guillaume Pellerin [Wed, 17 Jul 2013 13:57:10 +0000 (15:57 +0200)]
add course list pull
Guillaume Pellerin [Wed, 17 Jul 2013 13:57:10 +0000 (15:57 +0200)]
add course list pull
Guillaume Pellerin [Wed, 17 Jul 2013 13:47:19 +0000 (15:47 +0200)]
bugfix
Guillaume Pellerin [Wed, 17 Jul 2013 13:47:19 +0000 (15:47 +0200)]
bugfix
Guillaume Pellerin [Wed, 17 Jul 2013 13:42:47 +0000 (15:42 +0200)]
add course API
Guillaume Pellerin [Wed, 17 Jul 2013 13:42:47 +0000 (15:42 +0200)]
add course API
Guillaume Pellerin [Wed, 17 Jul 2013 13:03:34 +0000 (15:03 +0200)]
re-add conf record rpc methods
yomguy [Wed, 17 Jul 2013 13:04:48 +0000 (15:04 +0200)]
Merge branch 'tc202' of git+ssh://vcs.parisson.com/var/git/teleforma into tc202
yomguy [Wed, 17 Jul 2013 13:04:35 +0000 (15:04 +0200)]
rm googletools
Guillaume Pellerin [Wed, 17 Jul 2013 13:03:34 +0000 (15:03 +0200)]
re-add conf record rpc methods
Guillaume Pellerin [Tue, 16 Jul 2013 14:21:12 +0000 (16:21 +0200)]
rm googletools
Guillaume Pellerin [Tue, 16 Jul 2013 00:12:23 +0000 (02:12 +0200)]
Merge branch 'crfpa' into tc202
Conflicts:
teleforma/templates/teleforma/course_conference_record.html
Guillaume Pellerin [Tue, 16 Jul 2013 00:11:27 +0000 (02:11 +0200)]
update doc, update record video URL
Guillaume Pellerin [Mon, 15 Jul 2013 08:24:19 +0000 (10:24 +0200)]
fix broadcast message command
Guillaume Pellerin [Mon, 15 Jul 2013 08:10:20 +0000 (10:10 +0200)]
fix no period, fix document.save
Guillaume Pellerin [Sat, 13 Jul 2013 19:26:09 +0000 (21:26 +0200)]
add jqchat mess move script
Guillaume Pellerin [Sat, 13 Jul 2013 19:26:09 +0000 (21:26 +0200)]
add jqchat mess move script
Guillaume Pellerin [Fri, 12 Jul 2013 00:58:10 +0000 (02:58 +0200)]
Merge branch 'crfpa' into tc202
Conflicts:
teleforma/locale/fr/LC_MESSAGES/django.mo
teleforma/views/core.py
Guillaume Pellerin [Fri, 12 Jul 2013 00:53:46 +0000 (02:53 +0200)]
locale fr
Guillaume Pellerin [Fri, 12 Jul 2013 00:48:37 +0000 (02:48 +0200)]
finally fix live message
Guillaume Pellerin [Fri, 12 Jul 2013 00:41:27 +0000 (02:41 +0200)]
bugfix again
Guillaume Pellerin [Fri, 12 Jul 2013 00:39:48 +0000 (02:39 +0200)]
bugfix
Guillaume Pellerin [Fri, 12 Jul 2013 00:38:04 +0000 (02:38 +0200)]
bugfix
Guillaume Pellerin [Fri, 12 Jul 2013 00:36:20 +0000 (02:36 +0200)]
fix conference create
Guillaume Pellerin [Fri, 12 Jul 2013 00:16:00 +0000 (02:16 +0200)]
try to fix conf push with mess
Guillaume Pellerin [Fri, 12 Jul 2013 00:06:04 +0000 (02:06 +0200)]
add bot message to tweeter on conf creation
Guillaume Pellerin [Thu, 11 Jul 2013 23:18:28 +0000 (01:18 +0200)]
fix rooms vs. context (add TELEFORMA_PERIOD_TWEETER)
Guillaume Pellerin [Thu, 11 Jul 2013 22:43:40 +0000 (00:43 +0200)]
add room to record page
Guillaume Pellerin [Thu, 11 Jul 2013 22:34:48 +0000 (00:34 +0200)]
filter tweeters by period
Guillaume Pellerin [Thu, 11 Jul 2013 22:17:25 +0000 (00:17 +0200)]
optimize views against courses
Guillaume Pellerin [Thu, 11 Jul 2013 22:06:48 +0000 (00:06 +0200)]
rearrange views
Guillaume Pellerin [Thu, 11 Jul 2013 21:29:30 +0000 (23:29 +0200)]
add push/pull commands for confs anf profs
Guillaume Pellerin [Thu, 11 Jul 2013 21:27:51 +0000 (23:27 +0200)]
add CourseAccessMixin
Guillaume Pellerin [Thu, 11 Jul 2013 21:06:21 +0000 (23:06 +0200)]
HOST context goes to telecaster-client
Guillaume Pellerin [Thu, 11 Jul 2013 16:24:38 +0000 (18:24 +0200)]
fix HOST context
Guillaume Pellerin [Thu, 11 Jul 2013 16:05:56 +0000 (18:05 +0200)]
fix courses
Guillaume Pellerin [Thu, 11 Jul 2013 16:03:24 +0000 (18:03 +0200)]
bugdix
Guillaume Pellerin [Thu, 11 Jul 2013 16:00:35 +0000 (18:00 +0200)]
fix course format
Guillaume Pellerin [Thu, 11 Jul 2013 15:59:43 +0000 (17:59 +0200)]
Merge branch 'crfpa' into tc202dev
Conflicts:
teleforma/locale/fr/LC_MESSAGES/django.mo
Guillaume Pellerin [Thu, 11 Jul 2013 15:42:37 +0000 (17:42 +0200)]
various record bugfix
Guillaume Pellerin [Thu, 11 Jul 2013 13:30:04 +0000 (15:30 +0200)]
fix stream slug
Guillaume Pellerin [Thu, 11 Jul 2013 12:45:44 +0000 (14:45 +0200)]
update record view, fix no station
Guillaume Pellerin [Thu, 11 Jul 2013 11:07:24 +0000 (13:07 +0200)]
cleanup conf create
Guillaume Pellerin [Thu, 11 Jul 2013 10:48:47 +0000 (12:48 +0200)]
fix prof profile
Guillaume Pellerin [Thu, 11 Jul 2013 10:46:03 +0000 (12:46 +0200)]
fix prof metadata
Guillaume Pellerin [Thu, 11 Jul 2013 10:28:35 +0000 (12:28 +0200)]
add ProfessorListView with JSON pull method
Guillaume Pellerin [Thu, 11 Jul 2013 09:58:03 +0000 (11:58 +0200)]
fix video poster url
Guillaume Pellerin [Thu, 11 Jul 2013 09:56:24 +0000 (11:56 +0200)]
add thumbnails to media preview
Guillaume Pellerin [Thu, 11 Jul 2013 09:40:17 +0000 (11:40 +0200)]
fix period context in views
Guillaume Pellerin [Wed, 10 Jul 2013 21:25:35 +0000 (23:25 +0200)]
add cummulative filters to user list views
projects / teleforma.git / log