]>
git.parisson.com Git - teleforma.git/log
Guillaume Pellerin [Mon, 30 Jan 2023 22:19:53 +0000 (23:19 +0100)]
update stream url
Guillaume Pellerin [Mon, 23 Jan 2023 09:05:46 +0000 (10:05 +0100)]
add stream type to url
Guillaume Pellerin [Mon, 23 Jan 2023 10:01:02 +0000 (11:01 +0100)]
fix department slug
Yoan Le Clanche [Tue, 11 Jan 2022 15:56:20 +0000 (16:56 +0100)]
Fix "more video" link https://trackers.pilotsystems.net/prebarreau/0343
Yoan Le Clanche [Tue, 11 Jan 2022 15:48:10 +0000 (16:48 +0100)]
Fix student period filter https://trackers.pilotsystems.net/prebarreau/0341
Guillaume Pellerin [Wed, 29 Dec 2021 16:48:55 +0000 (17:48 +0100)]
Merge branch 'ae' of git.parisson.com:git/teleforma into ae
Guillaume Pellerin [Wed, 29 Dec 2021 16:48:24 +0000 (17:48 +0100)]
use HTTPS streaming behind Nginx
Yoan Le Clanche [Wed, 8 Sep 2021 14:21:41 +0000 (16:21 +0200)]
https://trackers.pilotsystems.net/probarreau/1124 : fix period admin filter
Yoan Le Clanche [Mon, 31 May 2021 09:56:59 +0000 (11:56 +0200)]
Fix error on user page
Yoan Le Clanche [Mon, 31 May 2021 09:36:43 +0000 (11:36 +0200)]
Fix merge issue
Yoan Le Clanche [Mon, 31 May 2021 09:36:22 +0000 (11:36 +0200)]
Merge branch 'ae-merge-crfpa' into ae
Yoan Le Clanche [Mon, 31 May 2021 09:00:07 +0000 (11:00 +0200)]
Last fixes before merge and production
Gael Le Mignot [Mon, 1 Mar 2021 10:07:41 +0000 (11:07 +0100)]
Initial working payment integration
Yoan Le Clanche [Thu, 25 Feb 2021 13:28:05 +0000 (14:28 +0100)]
WIP
Guillaume Pellerin [Fri, 29 Jan 2021 12:37:17 +0000 (13:37 +0100)]
cleanup
Guillaume Pellerin [Fri, 29 Jan 2021 12:36:17 +0000 (13:36 +0100)]
bugfix
Guillaume Pellerin [Tue, 26 Jan 2021 14:09:31 +0000 (15:09 +0100)]
add mp4 in original formats
Guillaume Pellerin [Tue, 26 Jan 2021 21:20:31 +0000 (22:20 +0100)]
add mp4 to media list
Yoan Le Clanche [Thu, 3 Dec 2020 16:46:32 +0000 (17:46 +0100)]
Merge fixes
Yoan Le Clanche [Wed, 2 Dec 2020 16:56:27 +0000 (17:56 +0100)]
Merge student model
Yoan Le Clanche [Wed, 2 Dec 2020 12:55:49 +0000 (13:55 +0100)]
Get file from crfpa
Yoan Le Clanche [Wed, 2 Dec 2020 12:48:04 +0000 (13:48 +0100)]
Merge branch 'ae' of git.parisson.com:git/teleforma into ae
Yoan Le Clanche [Wed, 2 Dec 2020 12:48:01 +0000 (13:48 +0100)]
Fix merge issues
Yoan Le Clanche [Wed, 2 Dec 2020 12:46:49 +0000 (13:46 +0100)]
Fix merge issues
Yoan Le Clanche [Wed, 2 Dec 2020 12:45:12 +0000 (13:45 +0100)]
1st merge of code / DB
Guillaume Pellerin [Tue, 24 Nov 2020 17:00:56 +0000 (18:00 +0100)]
fix video and poster display
Guillaume Pellerin [Tue, 30 Jun 2020 22:13:03 +0000 (22:13 +0000)]
views: avoid Document read by django, use serve_media with X-Accel instead
Guillaume Pellerin [Thu, 21 Nov 2019 14:00:24 +0000 (15:00 +0100)]
fix Document.file.path encoding
Guillaume Pellerin [Tue, 12 Nov 2019 10:46:10 +0000 (11:46 +0100)]
Merge branch 'ae' of git.parisson.com:git/teleforma into ae
Guillaume Pellerin [Tue, 12 Nov 2019 10:45:41 +0000 (11:45 +0100)]
fix http urls for streaming, avoid fileresponse by django
Guillaume Pellerin [Tue, 12 Nov 2019 10:42:35 +0000 (11:42 +0100)]
fix https in user email
Guillaume Pellerin [Thu, 1 Nov 2018 18:00:34 +0000 (19:00 +0100)]
Merge branch 'ae-dev' into ae
Guillaume Pellerin [Thu, 1 Nov 2018 18:03:39 +0000 (19:03 +0100)]
Fix import
Guillaume Pellerin [Thu, 1 Nov 2018 17:59:29 +0000 (18:59 +0100)]
Merge branch 'ae-dev' into ae
Guillaume Pellerin [Thu, 1 Nov 2018 17:58:30 +0000 (18:58 +0100)]
http to https
Guillaume Pellerin [Wed, 22 Aug 2018 20:38:30 +0000 (22:38 +0200)]
Merge remote-tracking branch 'origin/ae' into ae-dev
Guillaume Pellerin [Thu, 16 Aug 2018 13:32:12 +0000 (15:32 +0200)]
Add nginx X-Accel media access functions
Guillaume Pellerin [Wed, 25 Jul 2018 06:30:33 +0000 (08:30 +0200)]
Use settings.TELECASTER_LIVE_STREAMING_PORT by default
Guillaume Pellerin [Thu, 28 Jun 2018 12:10:14 +0000 (14:10 +0200)]
Use settings.TELECASTER_LIVE_STREAMING_SERVER, adapt urls to unique streaming server with 2 proxies and HTTPS
Guillaume Pellerin [Fri, 27 Jan 2017 17:19:27 +0000 (18:19 +0100)]
Fix slugify stream conf export
Guillaume Pellerin [Tue, 11 Oct 2016 08:25:32 +0000 (10:25 +0200)]
Fix no courses
Guillaume Pellerin [Thu, 13 Feb 2014 01:10:27 +0000 (02:10 +0100)]
fix email recipient name
Guillaume Pellerin [Wed, 29 Jan 2014 13:23:10 +0000 (14:23 +0100)]
media dir inside department
Guillaume Pellerin [Wed, 29 Jan 2014 13:19:43 +0000 (14:19 +0100)]
add department to conference import
Guillaume Pellerin [Tue, 19 Nov 2013 15:04:45 +0000 (16:04 +0100)]
Merge branch 'ae' of git+ssh://vcs.parisson.com/var/git/teleforma into ae
Conflicts:
teleforma/views/core.py
Guillaume Pellerin [Tue, 19 Nov 2013 15:01:41 +0000 (16:01 +0100)]
fix module
Conflicts:
teleforma/views/core.py
Guillaume Pellerin [Tue, 12 Nov 2013 16:21:30 +0000 (17:21 +0100)]
fix no prof, fix course list
Guillaume Pellerin [Mon, 11 Nov 2013 15:33:37 +0000 (16:33 +0100)]
fix period
Guillaume Pellerin [Mon, 11 Nov 2013 15:28:51 +0000 (16:28 +0100)]
add period to script
Guillaume Pellerin [Mon, 11 Nov 2013 14:33:03 +0000 (15:33 +0100)]
add conf delete script
Guillaume Pellerin [Tue, 29 Oct 2013 13:28:11 +0000 (14:28 +0100)]
add date filters for documents
Guillaume Pellerin [Mon, 9 Sep 2013 11:14:38 +0000 (13:14 +0200)]
Merge branch 'crfpa' into ae
Guillaume Pellerin [Mon, 9 Sep 2013 11:14:15 +0000 (13:14 +0200)]
auto nav height
Guillaume Pellerin [Mon, 9 Sep 2013 11:04:02 +0000 (13:04 +0200)]
Merge branch 'crfpa' into ae
Conflicts:
teleforma/views/core.py
Guillaume Pellerin [Mon, 9 Sep 2013 11:03:10 +0000 (13:03 +0200)]
fix long room title
Guillaume Pellerin [Fri, 23 Aug 2013 19:29:29 +0000 (21:29 +0200)]
fix site rooms again
Guillaume Pellerin [Fri, 23 Aug 2013 19:27:35 +0000 (21:27 +0200)]
fix rooms
Guillaume Pellerin [Thu, 22 Aug 2013 14:53:15 +0000 (16:53 +0200)]
Merge branch 'ae' into ae-dev
re-add analytics
Conflicts:
teleforma/templates/postman/email_user_init.txt
Guillaume Pellerin [Thu, 22 Aug 2013 14:25:31 +0000 (16:25 +0200)]
no annals
Guillaume Pellerin [Thu, 22 Aug 2013 14:23:44 +0000 (16:23 +0200)]
fix ae student
Guillaume Pellerin [Thu, 22 Aug 2013 14:13:13 +0000 (16:13 +0200)]
fix args
Guillaume Pellerin [Thu, 22 Aug 2013 13:31:36 +0000 (15:31 +0200)]
fix various docs
Guillaume Pellerin [Thu, 22 Aug 2013 13:05:12 +0000 (15:05 +0200)]
Merge branch 'crfpa' into ae-dev
Conflicts:
teleforma/admin.py
teleforma/locale/fr/LC_MESSAGES/django.mo
teleforma/locale/fr/LC_MESSAGES/django.po
teleforma/models/core.py
teleforma/templates/postman/email_user_init.txt
teleforma/templates/teleforma/course_conference.html
teleforma/templates/teleforma/course_conference_audio.html
teleforma/templates/teleforma/course_detail.html
teleforma/templates/teleforma/course_media.html
teleforma/templates/teleforma/courses.html
teleforma/views/core.py
teleforma/views/crfpa.py
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 13:27:44 +0000 (15:27 +0200)]
fix livestream str
Guillaume Pellerin [Mon, 22 Jul 2013 12:17:53 +0000 (14:17 +0200)]
fix host ip
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: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: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: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 18:03:17 +0000 (20:03 +0200)]
add stream conf generator
Guillaume Pellerin [Wed, 17 Jul 2013 17:11:59 +0000 (19:11 +0200)]
fix course pull
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 15:45:32 +0000 (17:45 +0200)]
try to fix conf create
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: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
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 [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
projects / teleforma.git / log