]>
git.parisson.com Git - teleforma.git/log
Guillaume Pellerin [Wed, 17 Jun 2020 15:34:59 +0000 (17:34 +0200)]
Merge branch 'dev' of git.parisson.com:git/teleforma
Guillaume Pellerin [Wed, 17 Jun 2020 15:32:09 +0000 (17:32 +0200)]
[templates] add explicit media links near video posters
Yoan Le Clanche [Wed, 17 Jun 2020 12:35:05 +0000 (14:35 +0200)]
V1
Gael Le Mignot [Wed, 10 Jun 2020 12:16:20 +0000 (14:16 +0200)]
Command to send Webclass notifications
Yoan Le Clanche [Mon, 8 Jun 2020 07:48:40 +0000 (09:48 +0200)]
Merge branch 'webclass' of git.parisson.com:git/teleforma into webclass
Yoan Le Clanche [Mon, 8 Jun 2020 07:48:37 +0000 (09:48 +0200)]
WIP
Gael Le Mignot [Fri, 5 Jun 2020 12:25:05 +0000 (14:25 +0200)]
Minor bug fixes in inscription module
Yoan Le Clanche [Thu, 4 Jun 2020 13:59:20 +0000 (15:59 +0200)]
WIP
Guillaume Pellerin [Mon, 18 May 2020 16:00:06 +0000 (18:00 +0200)]
Merge branch 'dev'
Gael Le Mignot [Mon, 18 May 2020 08:51:46 +0000 (10:51 +0200)]
Second hotfix for fake option Aucune
Guillaume Pellerin [Fri, 15 May 2020 15:42:05 +0000 (17:42 +0200)]
Merge branch 'dev'
Gael Le Mignot [Fri, 15 May 2020 15:17:10 +0000 (17:17 +0200)]
Hotfix by Yoan on messaging
Gael Le Mignot [Fri, 15 May 2020 15:12:59 +0000 (17:12 +0200)]
Hotfix for fake option Aucune
Guillaume Pellerin [Fri, 15 May 2020 10:29:57 +0000 (12:29 +0200)]
Merge branch 'master' of git.parisson.com:git/teleforma
Guillaume Pellerin [Fri, 15 May 2020 10:26:47 +0000 (12:26 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 12 May 2020 20:11:08 +0000 (22:11 +0200)]
Merge branch 'master' of git.parisson.com:git/teleforma
Guillaume Pellerin [Tue, 12 May 2020 20:10:25 +0000 (22:10 +0200)]
[documents] fix multiple course_type by document
Yoan Le Clanche [Mon, 11 May 2020 16:21:42 +0000 (18:21 +0200)]
allow teacher / admins / correctors to set custom recipient
Gael Le Mignot [Mon, 11 May 2020 12:46:04 +0000 (14:46 +0200)]
Added oral option on receipt
Guillaume Pellerin [Fri, 24 Apr 2020 07:53:20 +0000 (09:53 +0200)]
Merge branch 'dev' of git.parisson.com:git/teleforma
Guillaume Pellerin [Fri, 24 Apr 2020 07:50:43 +0000 (09:50 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 24 Apr 2020 07:50:16 +0000 (09:50 +0200)]
[command] fix period for conf copy
Guillaume Pellerin [Thu, 23 Apr 2020 16:10:57 +0000 (18:10 +0200)]
Merge branch 'dev'
Gael Le Mignot [Tue, 21 Apr 2020 09:27:51 +0000 (11:27 +0200)]
Inversing sort order for students
Guillaume Pellerin [Thu, 9 Apr 2020 07:12:07 +0000 (09:12 +0200)]
Merge branch 'dev'
Gael Le Mignot [Wed, 8 Apr 2020 11:58:10 +0000 (13:58 +0200)]
Receipt generation
Guillaume Pellerin [Wed, 19 Feb 2020 16:37:40 +0000 (17:37 +0100)]
Merge branch 'dev'
Yoan Le Clanche [Thu, 13 Feb 2020 09:06:33 +0000 (10:06 +0100)]
Override telemeta profile to add payment
Yoan Le Clanche [Mon, 10 Feb 2020 08:41:14 +0000 (09:41 +0100)]
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
Yoan Le Clanche [Thu, 6 Feb 2020 17:21:47 +0000 (18:21 +0100)]
Set registration fee after user registration
Yoan Le Clanche [Thu, 6 Feb 2020 17:19:06 +0000 (18:19 +0100)]
Change menu (set profile and logout link outside user menu)
Guillaume Pellerin [Thu, 6 Feb 2020 10:54:45 +0000 (11:54 +0100)]
[live] avoid videojs ATM
Yoan Le Clanche [Thu, 6 Feb 2020 10:36:06 +0000 (11:36 +0100)]
Add payment info to student profile
Yoan Le Clanche [Fri, 24 Jan 2020 16:34:42 +0000 (17:34 +0100)]
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
Yoan Le Clanche [Fri, 24 Jan 2020 16:34:34 +0000 (17:34 +0100)]
Add intermediary balance on student
Guillaume Pellerin [Fri, 24 Jan 2020 08:48:31 +0000 (09:48 +0100)]
[live] use videojs for live video stream
Yoan Le Clanche [Thu, 23 Jan 2020 16:16:30 +0000 (17:16 +0100)]
add corrector registration form
Yoan Le Clanche [Wed, 22 Jan 2020 17:14:47 +0000 (18:14 +0100)]
Hide correctors names https://trackers.pilotsystems.net/probarreau/0650
Yoan Le Clanche [Mon, 20 Jan 2020 17:05:11 +0000 (18:05 +0100)]
add payement type on xls export: https://trackers.pilotsystems.net/probarreau/0649
Yoan Le Clanche [Mon, 20 Jan 2020 17:04:29 +0000 (18:04 +0100)]
add comment field on student
Yoan Le Clanche [Mon, 20 Jan 2020 17:04:01 +0000 (18:04 +0100)]
add fascicule https://trackers.pilotsystems.net/probarreau/0648
Gael Le Mignot [Tue, 26 Nov 2019 10:55:52 +0000 (11:55 +0100)]
Merge branch '2019-sept' into dev
Gael Le Mignot [Mon, 25 Nov 2019 15:02:20 +0000 (16:02 +0100)]
Added/changed a few logs
Guillaume Pellerin [Thu, 21 Nov 2019 14:00:24 +0000 (15:00 +0100)]
fix Document.file.path encoding
Gael Le Mignot [Thu, 21 Nov 2019 09:31:46 +0000 (10:31 +0100)]
Changed a few text/mails
Yoan Le Clanche [Wed, 20 Nov 2019 10:43:05 +0000 (11:43 +0100)]
Add fascicule field https://trackers.pilotsystems.net/probarreau/0602
Gael Le Mignot [Wed, 20 Nov 2019 10:18:35 +0000 (11:18 +0100)]
Added fascicule form
Gael Le Mignot [Wed, 20 Nov 2019 09:58:09 +0000 (10:58 +0100)]
CSS changes for better payment form
Gael Le Mignot [Tue, 19 Nov 2019 14:18:31 +0000 (15:18 +0100)]
Added post-payment mail, minor payment bug fixes
Gael Le Mignot [Mon, 18 Nov 2019 15:15:15 +0000 (16:15 +0100)]
Added cards logo for online payment
Gael Le Mignot [Mon, 18 Nov 2019 15:13:28 +0000 (16:13 +0100)]
Initial working version of online payment
Guillaume Pellerin [Mon, 18 Nov 2019 11:32:58 +0000 (12:32 +0100)]
mv nginx container
Guillaume Pellerin [Thu, 14 Nov 2019 14:48:31 +0000 (15:48 +0100)]
fix period
Guillaume Pellerin [Thu, 14 Nov 2019 14:48:31 +0000 (15:48 +0100)]
fix period
Guillaume Pellerin [Thu, 14 Nov 2019 11:41:47 +0000 (12:41 +0100)]
Take Period messages for subsciption email
Gael Le Mignot [Tue, 12 Nov 2019 09:55:26 +0000 (10:55 +0100)]
Merge with dev
Gael Le Mignot [Tue, 12 Nov 2019 09:51:58 +0000 (10:51 +0100)]
Merge with dev
Gael Le Mignot [Tue, 12 Nov 2019 09:50:19 +0000 (10:50 +0100)]
Merge with 2019-oct
Yoan Le Clanche [Mon, 21 Oct 2019 14:34:09 +0000 (16:34 +0200)]
Registrer form UI rework and fix platform_only always True
Yoan Le Clanche [Mon, 14 Oct 2019 16:08:14 +0000 (18:08 +0200)]
trainings are now filtered on platform_only field on register page : https://trackers.pilotsystems.net/probarreau/0552
Yoan Le Clanche [Mon, 14 Oct 2019 08:38:15 +0000 (10:38 +0200)]
merge dev to 2019-oct
Yoan Le Clanche [Mon, 14 Oct 2019 08:24:01 +0000 (10:24 +0200)]
dev
Guillaume Pellerin [Fri, 11 Oct 2019 15:59:39 +0000 (17:59 +0200)]
Add migration
Guillaume Pellerin [Fri, 11 Oct 2019 15:51:54 +0000 (17:51 +0200)]
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
Guillaume Pellerin [Fri, 11 Oct 2019 15:51:34 +0000 (17:51 +0200)]
Add Training.platform_only
Yoan Le Clanche [Fri, 4 Oct 2019 14:09:43 +0000 (16:09 +0200)]
Registration form minor changes. All
yleclanche [Thu, 19 Sep 2019 09:22:02 +0000 (11:22 +0200)]
Change accepted ratio
Yoan Le Clanche [Wed, 18 Sep 2019 08:13:24 +0000 (10:13 +0200)]
register form remake
yleclanche [Tue, 10 Sep 2019 09:08:57 +0000 (11:08 +0200)]
Add portrait, introduction text and "accept" checkbox to registration form
Gael Le Mignot [Thu, 19 Sep 2019 13:58:16 +0000 (15:58 +0200)]
Merge branch '2019-sept' of git.parisson.com:git/teleforma into 2019-sept
Gael Le Mignot [Thu, 19 Sep 2019 13:58:08 +0000 (15:58 +0200)]
First shot of integrating online payment, all bank-related things are stubs for now
yleclanche [Thu, 19 Sep 2019 09:22:02 +0000 (11:22 +0200)]
Change accepted ratio
Yoan Le Clanche [Wed, 18 Sep 2019 08:13:24 +0000 (10:13 +0200)]
register form remake
yleclanche [Tue, 10 Sep 2019 09:08:57 +0000 (11:08 +0200)]
Add portrait, introduction text and "accept" checkbox to registration form
yleclanche [Mon, 12 Aug 2019 14:49:22 +0000 (16:49 +0200)]
Fix crash when there are more than 61 quotas "MariaDB can only use 61 tables in a join"
Yoan Le Clanche [Fri, 9 Aug 2019 13:38:59 +0000 (15:38 +0200)]
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
yleclanche [Fri, 9 Aug 2019 12:26:11 +0000 (14:26 +0200)]
Users can now send messages to correctors.
yleclanche [Thu, 8 Aug 2019 12:19:58 +0000 (14:19 +0200)]
Rejected script are now excluded from scripts limit count
Guillaume Pellerin [Tue, 6 Aug 2019 08:41:58 +0000 (10:41 +0200)]
Fix regression on period and session filtering on Quota.script_count
Guillaume Pellerin [Sat, 3 Aug 2019 15:21:56 +0000 (17:21 +0200)]
Merge branch 'pdfannotator' into dev
Conflicts:
teleforma/exam/models.py
Gael Le Mignot [Mon, 29 Jul 2019 08:41:35 +0000 (10:41 +0200)]
Workaround for weird bug due to comparing datetime and date objects
Guillaume Pellerin [Wed, 24 Jul 2019 07:18:49 +0000 (09:18 +0200)]
finally avoid live streaming URL and then X-Accel (overload when seeking)
Guillaume Pellerin [Sat, 20 Jul 2019 21:22:47 +0000 (23:22 +0200)]
Merge branch 'master-http'
Guillaume Pellerin [Sat, 20 Jul 2019 21:22:04 +0000 (23:22 +0200)]
Fix zero script return
Guillaume Pellerin [Sat, 20 Jul 2019 21:01:35 +0000 (23:01 +0200)]
hotfix no Quota.corrector
Yoan Le Clanche [Thu, 18 Jul 2019 15:10:57 +0000 (17:10 +0200)]
fix infinite redirect when user does not have home view permission
Yoan Le Clanche [Thu, 18 Jul 2019 15:10:07 +0000 (17:10 +0200)]
Send mail on auto-reject https://trackers.pilotsystems.net/probarreau/0501
Yoan Le Clanche [Wed, 3 Jul 2019 12:14:40 +0000 (14:14 +0200)]
fix quota computation on admin page https://trackers.pilotsystems.net/probarreau/0483
Yoan Le Clanche [Fri, 7 Jun 2019 13:07:12 +0000 (15:07 +0200)]
fix issue with back button on student page https://trackers.pilotsystems.net/probarreau/0481
Yoan Le Clanche [Fri, 7 Jun 2019 13:03:56 +0000 (15:03 +0200)]
hide training field on admin student page : https://trackers.pilotsystems.net/probarreau/0478
Yoan Le Clanche [Fri, 7 Jun 2019 08:35:02 +0000 (10:35 +0200)]
add period and session column and filters to admin quota : https://trackers.pilotsystems.net/probarreau/0484
Yoan Le Clanche [Tue, 28 May 2019 16:02:33 +0000 (18:02 +0200)]
Fix balance & fix crash when exporting user with birthdate < 1900, and add a subscription_fees field
Guillaume Pellerin [Thu, 2 May 2019 09:08:31 +0000 (11:08 +0200)]
fix no Conference.streaming
Guillaume Pellerin [Fri, 26 Apr 2019 15:21:10 +0000 (17:21 +0200)]
use https in mail
Yoan Le Clanche [Fri, 26 Apr 2019 14:29:14 +0000 (16:29 +0200)]
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
Yoan Le Clanche [Thu, 25 Apr 2019 16:07:10 +0000 (18:07 +0200)]
Correctors are not allowed anymore to see the chat : https://trackers.pilotsystems.net/probarreau/0467
Yoan Le Clanche [Thu, 25 Apr 2019 16:05:52 +0000 (18:05 +0200)]
remove one of the two 'answer' button on postman
Yoan Le Clanche [Thu, 25 Apr 2019 15:02:11 +0000 (17:02 +0200)]
Correctors can't filter on correctors on scripts list : https://trackers.pilotsystems.net/probarreau/0466
Yoan Le Clanche [Thu, 25 Apr 2019 13:30:48 +0000 (15:30 +0200)]
display full address on profile page : https://trackers.pilotsystems.net/probarreau/0470
Yoan Le Clanche [Thu, 25 Apr 2019 13:30:18 +0000 (15:30 +0200)]
remove automatic teacher selection with postman : https://trackers.pilotsystems.net/probarreau/0469
projects / teleforma.git / log