]> git.parisson.com Git - teleforma.git/log
teleforma.git
12 years agoavoid video download
yomguy [Thu, 14 Feb 2013 16:02:59 +0000 (17:02 +0100)]
avoid video download

12 years agofix professor links
yomguy [Tue, 12 Feb 2013 14:54:53 +0000 (15:54 +0100)]
fix professor links

12 years agofix js
yomguy [Mon, 4 Feb 2013 11:15:40 +0000 (12:15 +0100)]
fix js

12 years agoadd ROUTER_IP to forward streams
yomguy [Wed, 5 Dec 2012 11:10:15 +0000 (12:10 +0100)]
add ROUTER_IP to forward streams

12 years agofix AE doc
yomguy [Mon, 19 Nov 2012 08:04:11 +0000 (09:04 +0100)]
fix AE doc

12 years agofix
yomguy [Thu, 8 Nov 2012 16:59:27 +0000 (17:59 +0100)]
fix

12 years agofix
yomguy [Thu, 8 Nov 2012 16:57:53 +0000 (17:57 +0100)]
fix

12 years agoordering professors
yomguy [Thu, 8 Nov 2012 16:46:32 +0000 (17:46 +0100)]
ordering professors

12 years agoMerge branch 'ae' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
yomguy [Wed, 7 Nov 2012 11:32:12 +0000 (12:32 +0100)]
Merge branch 'ae' of git+ssh://vcs.parisson.com/var/git/teleforma into dev

12 years agofix conf title
yomguy [Wed, 7 Nov 2012 11:31:55 +0000 (12:31 +0100)]
fix conf title

12 years agoMerge branch 'dev' of /var/git/teleforma into ae
Guillaume Pellerin [Wed, 7 Nov 2012 11:29:09 +0000 (12:29 +0100)]
Merge branch 'dev' of /var/git/teleforma into ae

12 years agofix no conf type, add X (test) course to CRFPA, fix media title
yomguy [Wed, 7 Nov 2012 11:28:01 +0000 (12:28 +0100)]
fix no conf type, add X (test) course to CRFPA, fix media title

12 years agoMerge branch 'dev' of /var/git/teleforma into ae
Guillaume Pellerin [Wed, 7 Nov 2012 11:07:15 +0000 (12:07 +0100)]
Merge branch 'dev' of /var/git/teleforma into ae

12 years agoadd X (test) course for admins
yomguy [Wed, 7 Nov 2012 11:06:42 +0000 (12:06 +0100)]
add X (test) course for admins

12 years agoMerge branch 'dev' of /var/git/teleforma into ae
Guillaume Pellerin [Wed, 7 Nov 2012 10:52:00 +0000 (11:52 +0100)]
Merge branch 'dev' of /var/git/teleforma into ae

12 years agodisplay prof username
yomguy [Wed, 7 Nov 2012 10:51:26 +0000 (11:51 +0100)]
display prof username

12 years agoMerge branch 'dev' of /var/git/teleforma into ae
Guillaume Pellerin [Wed, 7 Nov 2012 10:49:09 +0000 (11:49 +0100)]
Merge branch 'dev' of /var/git/teleforma into ae

12 years agoauto add new (blank) professor when missing
yomguy [Wed, 7 Nov 2012 10:47:46 +0000 (11:47 +0100)]
auto add new (blank) professor when missing

12 years agoMerge branch 'dev' of /var/git/teleforma into ae
Guillaume Pellerin [Wed, 7 Nov 2012 09:49:07 +0000 (10:49 +0100)]
Merge branch 'dev' of /var/git/teleforma into ae

12 years agofix media period on import
yomguy [Wed, 7 Nov 2012 09:48:39 +0000 (10:48 +0100)]
fix media period on import

12 years agoMerge branch 'dev' of /var/git/teleforma into ae
Guillaume Pellerin [Mon, 5 Nov 2012 16:08:41 +0000 (17:08 +0100)]
Merge branch 'dev' of /var/git/teleforma into ae

12 years agoadd ae init pass
yomguy [Mon, 5 Nov 2012 16:07:58 +0000 (17:07 +0100)]
add ae init pass

12 years agoMerge branch 'dev' of /var/git/teleforma into ae
Guillaume Pellerin [Mon, 5 Nov 2012 15:38:39 +0000 (16:38 +0100)]
Merge branch 'dev' of /var/git/teleforma into ae

12 years agofix prof
yomguy [Mon, 5 Nov 2012 15:38:02 +0000 (16:38 +0100)]
fix prof

12 years agoMerge branch 'dev' of /var/git/teleforma into ae
Guillaume Pellerin [Mon, 5 Nov 2012 15:33:10 +0000 (16:33 +0100)]
Merge branch 'dev' of /var/git/teleforma into ae

12 years agofix conf department
yomguy [Mon, 5 Nov 2012 15:32:20 +0000 (16:32 +0100)]
fix conf department

12 years agofix json department
yomguy [Mon, 5 Nov 2012 15:30:08 +0000 (16:30 +0100)]
fix json department

12 years agoMerge branch 'dev' into ae
yomguy [Sun, 4 Nov 2012 22:54:03 +0000 (23:54 +0100)]
Merge branch 'dev' into ae

12 years agofix conference creation super return
yomguy [Sun, 4 Nov 2012 17:20:21 +0000 (18:20 +0100)]
fix conference creation super return

12 years agogo to 0.9
yomguy [Sun, 4 Nov 2012 17:15:24 +0000 (18:15 +0100)]
go to 0.9

12 years agorm TELECASTER_MASTER_SERVER, get conference.department.domain instead
yomguy [Sun, 4 Nov 2012 16:57:14 +0000 (17:57 +0100)]
rm TELECASTER_MASTER_SERVER, get conference.department.domain instead

12 years agoadd department to conference views
yomguy [Sun, 4 Nov 2012 16:47:14 +0000 (17:47 +0100)]
add department to conference views

12 years agoMerge branch 'dev' into ae
yomguy [Sat, 3 Nov 2012 12:38:28 +0000 (13:38 +0100)]
Merge branch 'dev' into ae

12 years agoallow "None" course type for one bloc courses only
yomguy [Sat, 3 Nov 2012 12:37:10 +0000 (13:37 +0100)]
allow "None" course type for one bloc courses only

12 years agopartially fix email text, make all tweeter general
yomguy [Fri, 2 Nov 2012 15:44:14 +0000 (16:44 +0100)]
partially fix email text, make all tweeter general

12 years agoMerge branch 'dev' into ae
yomguy [Fri, 2 Nov 2012 14:16:56 +0000 (15:16 +0100)]
Merge branch 'dev' into ae

12 years agofix periods for admins
yomguy [Fri, 2 Nov 2012 14:16:41 +0000 (15:16 +0100)]
fix periods for admins

12 years agofix fr locale
yomguy [Fri, 2 Nov 2012 14:12:01 +0000 (15:12 +0100)]
fix fr locale

12 years agoMerge branch 'dev' into ae
yomguy [Fri, 2 Nov 2012 14:09:53 +0000 (15:09 +0100)]
Merge branch 'dev' into ae

12 years agoupdate fr locale
yomguy [Fri, 2 Nov 2012 14:09:37 +0000 (15:09 +0100)]
update fr locale

12 years agorm CRFPA student profile from admin
yomguy [Fri, 2 Nov 2012 13:58:38 +0000 (14:58 +0100)]
rm CRFPA student profile from admin

12 years agoremove double form_valid call on conference record
yomguy [Fri, 2 Nov 2012 13:32:06 +0000 (14:32 +0100)]
remove double form_valid call on conference record

12 years agoadd period to conference recording
yomguy [Fri, 2 Nov 2012 13:20:14 +0000 (14:20 +0100)]
add period to conference recording

12 years agoadd period filtering for contents
yomguy [Fri, 2 Nov 2012 11:01:41 +0000 (12:01 +0100)]
add period filtering for contents

12 years agoTELEFORMA_GENERAL_TWEETER to TELEFORMA_GLOBAL_TWEETER
yomguy [Fri, 2 Nov 2012 10:24:12 +0000 (11:24 +0100)]
TELEFORMA_GENERAL_TWEETER to TELEFORMA_GLOBAL_TWEETER

12 years agofix AE admin
yomguy [Fri, 2 Nov 2012 10:22:15 +0000 (11:22 +0100)]
fix AE admin

12 years agoadd period to contents, TELEFORMA_GENERAL_TWEETER setting to determine if the tweeter...
yomguy [Fri, 2 Nov 2012 10:16:05 +0000 (11:16 +0100)]
add period to contents, TELEFORMA_GENERAL_TWEETER setting to determine if the tweeter is globally general or only in the desktop

12 years agoadd AE models and views
yomguy [Fri, 2 Nov 2012 09:57:29 +0000 (10:57 +0100)]
add AE models and views

12 years agoMerge branch 'pro' into dev
yomguy [Wed, 31 Oct 2012 15:14:59 +0000 (16:14 +0100)]
Merge branch 'pro' into dev

12 years agoupdate pro models, add seminar view
yomguy [Wed, 31 Oct 2012 09:34:55 +0000 (10:34 +0100)]
update pro models, add seminar view

12 years agoadd forms & keywords
yomguy [Fri, 19 Oct 2012 17:02:33 +0000 (19:02 +0200)]
add forms & keywords

12 years agoadd answer validate
yomguy [Wed, 17 Oct 2012 13:29:02 +0000 (15:29 +0200)]
add answer validate

12 years agotest
yomguy [Wed, 17 Oct 2012 12:56:57 +0000 (14:56 +0200)]
test

12 years agoadd views
yomguy [Wed, 17 Oct 2012 12:34:04 +0000 (14:34 +0200)]
add views

12 years agofix pro model, split views
yomguy [Wed, 17 Oct 2012 12:33:38 +0000 (14:33 +0200)]
fix pro model, split views

12 years agofix pro admin for seminars and questions, split models, add migrations
yomguy [Tue, 16 Oct 2012 16:55:10 +0000 (18:55 +0200)]
fix pro admin for seminars and questions, split models, add migrations

12 years agocleanup fields
yomguy [Tue, 16 Oct 2012 15:26:40 +0000 (17:26 +0200)]
cleanup fields

12 years agoadd 404 & 500
yomguy [Tue, 16 Oct 2012 13:53:46 +0000 (15:53 +0200)]
add 404 & 500

12 years agoadd 404
yomguy [Tue, 16 Oct 2012 07:43:44 +0000 (09:43 +0200)]
add 404

12 years agoupdate pro model for seminars
yomguy [Tue, 16 Oct 2012 07:16:17 +0000 (09:16 +0200)]
update pro model for seminars

12 years agoadd testimonial and status
yomguy [Wed, 10 Oct 2012 21:49:58 +0000 (23:49 +0200)]
add testimonial and status

12 years agoadd first seminar model
yomguy [Tue, 9 Oct 2012 17:04:02 +0000 (19:04 +0200)]
add first seminar model

12 years agocleanup
yomguy [Tue, 9 Oct 2012 12:45:47 +0000 (14:45 +0200)]
cleanup

12 years agofix station streaming
yomguy [Tue, 9 Oct 2012 12:42:11 +0000 (14:42 +0200)]
fix station streaming

12 years agofix various static links
yomguy [Mon, 24 Sep 2012 11:50:05 +0000 (13:50 +0200)]
fix various static links

12 years agoadd admin template
yomguy [Thu, 20 Sep 2012 15:04:21 +0000 (17:04 +0200)]
add admin template

12 years agocleanup
yomguy [Wed, 19 Sep 2012 21:43:04 +0000 (23:43 +0200)]
cleanup

12 years agofix again
yomguy [Wed, 19 Sep 2012 21:35:13 +0000 (23:35 +0200)]
fix again

12 years agofix new views for telemeta dev
yomguy [Wed, 19 Sep 2012 21:00:59 +0000 (23:00 +0200)]
fix new views for telemeta dev

12 years agorm shots
yomguy [Wed, 19 Sep 2012 20:59:35 +0000 (22:59 +0200)]
rm shots

12 years agotry to fix img
yomguy [Wed, 19 Sep 2012 20:52:12 +0000 (22:52 +0200)]
try to fix img

12 years agotry to fix img
yomguy [Wed, 19 Sep 2012 20:50:54 +0000 (22:50 +0200)]
try to fix img

12 years agoadd shots
yomguy [Wed, 19 Sep 2012 20:48:47 +0000 (22:48 +0200)]
add shots

12 years agofix again
yomguy [Wed, 19 Sep 2012 20:01:01 +0000 (22:01 +0200)]
fix again

12 years agofix again
yomguy [Wed, 19 Sep 2012 20:00:12 +0000 (22:00 +0200)]
fix again

12 years agoadd shot
yomguy [Wed, 19 Sep 2012 19:59:55 +0000 (21:59 +0200)]
add shot

12 years agofix again
yomguy [Wed, 19 Sep 2012 19:57:32 +0000 (21:57 +0200)]
fix again

12 years agofix
yomguy [Wed, 19 Sep 2012 19:55:36 +0000 (21:55 +0200)]
fix

12 years agoupdate doc
yomguy [Wed, 19 Sep 2012 19:53:42 +0000 (21:53 +0200)]
update doc

12 years agofix readme
yomguy [Wed, 19 Sep 2012 19:32:28 +0000 (21:32 +0200)]
fix readme

12 years agomessage list per message
yomguy [Wed, 5 Sep 2012 08:03:53 +0000 (10:03 +0200)]
message list per message

12 years agofix conf infos
yomguy [Wed, 22 Aug 2012 08:58:43 +0000 (10:58 +0200)]
fix conf infos

12 years agobugfix
yomguy [Mon, 20 Aug 2012 13:35:55 +0000 (15:35 +0200)]
bugfix

12 years agofix info again
yomguy [Sat, 18 Aug 2012 22:15:10 +0000 (00:15 +0200)]
fix info again

12 years agofix course link and type
yomguy [Sat, 18 Aug 2012 22:11:14 +0000 (00:11 +0200)]
fix course link and type

12 years agoadd media ID
yomguy [Sat, 18 Aug 2012 22:06:05 +0000 (00:06 +0200)]
add media ID

12 years agoadd date modified to media infos, trans
yomguy [Sat, 18 Aug 2012 22:03:17 +0000 (00:03 +0200)]
add date modified to media infos, trans

12 years agofix again media and conf infos
yomguy [Sat, 18 Aug 2012 21:57:39 +0000 (23:57 +0200)]
fix again media and conf infos

12 years agofix conference details, add cours link title, add conf admin search fields
yomguy [Sat, 18 Aug 2012 21:51:03 +0000 (23:51 +0200)]
fix conference details, add cours link title, add conf admin search fields

12 years agoadd id to media admin search
yomguy [Sat, 18 Aug 2012 21:11:15 +0000 (23:11 +0200)]
add id to media admin search

12 years agofix preview bg 0.8.5
yomguy [Sat, 18 Aug 2012 20:22:06 +0000 (22:22 +0200)]
fix preview bg

12 years agothumbnailing media preview, sorl-thumbnail needed
yomguy [Sat, 18 Aug 2012 17:28:06 +0000 (19:28 +0200)]
thumbnailing media preview, sorl-thumbnail needed

12 years agofix live conference title
yomguy [Wed, 15 Aug 2012 16:23:00 +0000 (18:23 +0200)]
fix live conference title

12 years agominimize play button
yomguy [Tue, 14 Aug 2012 19:32:40 +0000 (21:32 +0200)]
minimize play button

12 years agoMerge branch 'feature/playicon' into dev
yomguy [Sun, 12 Aug 2012 08:09:44 +0000 (10:09 +0200)]
Merge branch 'feature/playicon' into dev

Conflicts:
teleforma/templates/teleforma/inc/media_list.html

12 years agoalpha play button
yomguy [Sun, 12 Aug 2012 08:02:35 +0000 (10:02 +0200)]
alpha play button

12 years agono repeat
yomguy [Fri, 10 Aug 2012 14:34:02 +0000 (16:34 +0200)]
no repeat

12 years agofix preview title
yomguy [Thu, 9 Aug 2012 23:22:12 +0000 (01:22 +0200)]
fix preview title

12 years agoadd a play button to item preview in media list
yomguy [Thu, 9 Aug 2012 23:09:44 +0000 (01:09 +0200)]
add a play button to item preview in media list

12 years agofix media title, add id search field to conf admin
yomguy [Wed, 8 Aug 2012 08:41:01 +0000 (10:41 +0200)]
fix media title, add id search field to conf admin