]>
git.parisson.com Git - teleforma.git/log
Guillaume Pellerin [Wed, 3 Oct 2018 09:47:22 +0000 (11:47 +0200)]
Merge branch 'master' of git.parisson.com:git/teleforma
Yoan Le Clanche [Mon, 1 Oct 2018 09:14:16 +0000 (11:14 +0200)]
remove debug mail and format csv date
Yoan Le Clanche [Mon, 1 Oct 2018 09:04:49 +0000 (11:04 +0200)]
Merge branch 'dev' into appointment
Guillaume Pellerin [Fri, 28 Sep 2018 08:23:52 +0000 (10:23 +0200)]
Merge branch 'master' of git.parisson.com:git/teleforma
Yoan Le Clanche [Thu, 27 Sep 2018 14:52:27 +0000 (16:52 +0200)]
merge
Yoan Le Clanche [Thu, 27 Sep 2018 14:50:18 +0000 (16:50 +0200)]
now can set multiples period per appointments periods
Yoan Le Clanche [Thu, 27 Sep 2018 08:32:49 +0000 (10:32 +0200)]
rework
Guillaume Pellerin [Thu, 27 Sep 2018 06:20:26 +0000 (08:20 +0200)]
Merge branch 'master' of git.parisson.com:git/teleforma
Guillaume Pellerin [Thu, 27 Sep 2018 06:19:52 +0000 (08:19 +0200)]
FIXME comment buggy empty news list
Guillaume Pellerin [Thu, 27 Sep 2018 06:13:35 +0000 (08:13 +0200)]
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
Yoan Le Clanche [Wed, 26 Sep 2018 15:48:06 +0000 (17:48 +0200)]
change appointment link condition
Yoan Le Clanche [Wed, 26 Sep 2018 15:33:02 +0000 (17:33 +0200)]
Merge branch 'appointment' into dev
Yoan Le Clanche [Wed, 26 Sep 2018 15:31:39 +0000 (17:31 +0200)]
remove dev code
Yoan Le Clanche [Wed, 26 Sep 2018 13:09:57 +0000 (15:09 +0200)]
Merge branch 'appointment' of git.parisson.com:git/teleforma into appointment
Yoan Le Clanche [Wed, 26 Sep 2018 13:09:35 +0000 (15:09 +0200)]
various fixes after dorothee tests
Gael Le Mignot [Wed, 19 Sep 2018 13:05:38 +0000 (15:05 +0200)]
Merge branch 'appointment' of git.parisson.com:git/teleforma into appointment
Gael Le Mignot [Wed, 19 Sep 2018 13:05:34 +0000 (15:05 +0200)]
Minor fixes
Yoan Le Clanche [Wed, 19 Sep 2018 13:04:04 +0000 (15:04 +0200)]
dev
Yoan Le Clanche [Wed, 19 Sep 2018 12:10:58 +0000 (14:10 +0200)]
Merge branch 'appointment' of git.parisson.com:git/teleforma into appointment
Yoan Le Clanche [Wed, 19 Sep 2018 12:10:44 +0000 (14:10 +0200)]
dev
Gael Le Mignot [Wed, 19 Sep 2018 09:30:20 +0000 (11:30 +0200)]
Sending notification
Yoan Le Clanche [Wed, 19 Sep 2018 07:46:51 +0000 (09:46 +0200)]
dev
Yoan Le Clanche [Tue, 18 Sep 2018 16:00:14 +0000 (18:00 +0200)]
dev
Gael Le Mignot [Tue, 18 Sep 2018 15:56:00 +0000 (17:56 +0200)]
First shot of constraint validation for appointment
Yoan Le Clanche [Tue, 18 Sep 2018 13:05:25 +0000 (15:05 +0200)]
add appointment UI
Yoan Le Clanche [Tue, 18 Sep 2018 12:47:02 +0000 (14:47 +0200)]
add appointment UI
Gael Le Mignot [Mon, 17 Sep 2018 13:46:27 +0000 (15:46 +0200)]
Basic models and admin for appointment module
Guillaume Pellerin [Wed, 22 Aug 2018 19:39:47 +0000 (21:39 +0200)]
fix lines
Guillaume Pellerin [Mon, 20 Aug 2018 08:31:59 +0000 (10:31 +0200)]
Download button in list restricted to allowed users
Guillaume Pellerin [Sun, 19 Aug 2018 12:54:06 +0000 (14:54 +0200)]
bugfix
Guillaume Pellerin [Sat, 18 Aug 2018 21:45:16 +0000 (23:45 +0200)]
Fix no message recipient or sender
Guillaume Pellerin [Fri, 17 Aug 2018 10:21:37 +0000 (12:21 +0200)]
rename streaming to stream
Guillaume Pellerin [Fri, 17 Aug 2018 00:30:09 +0000 (02:30 +0200)]
Fix media url, add 404
Guillaume Pellerin [Thu, 16 Aug 2018 14:49:30 +0000 (16:49 +0200)]
try to fix kwargs
Guillaume Pellerin [Thu, 16 Aug 2018 14:47:28 +0000 (16:47 +0200)]
fix urls methods
Guillaume Pellerin [Thu, 16 Aug 2018 14:46:48 +0000 (16:46 +0200)]
fix args
Guillaume Pellerin [Thu, 16 Aug 2018 14:44:44 +0000 (16:44 +0200)]
fix urls
Guillaume Pellerin [Thu, 16 Aug 2018 14:42:52 +0000 (16:42 +0200)]
fix ulrs, temporary DEBUG
Guillaume Pellerin [Thu, 16 Aug 2018 14:40:55 +0000 (16:40 +0200)]
back to embded streaming method
Guillaume Pellerin [Thu, 16 Aug 2018 14:30:19 +0000 (16:30 +0200)]
bugfix
Guillaume Pellerin [Thu, 16 Aug 2018 14:23:55 +0000 (16:23 +0200)]
Add CBV media streaming and download views
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, 19 Jul 2018 14:03:27 +0000 (16:03 +0200)]
Merge branch 'master' of git.parisson.com:git/teleforma
Guillaume Pellerin [Thu, 19 Jul 2018 14:03:01 +0000 (16:03 +0200)]
goto 1.3, fix wifi user data export command
Guillaume Pellerin [Fri, 13 Jul 2018 11:04:46 +0000 (13:04 +0200)]
Merge branch 'dev' of git.parisson.com:git/teleforma
Guillaume Pellerin [Fri, 13 Jul 2018 11:02:13 +0000 (13:02 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 13 Jul 2018 11:01:55 +0000 (13:01 +0200)]
fix period
Guillaume Pellerin [Fri, 13 Jul 2018 11:01:18 +0000 (13:01 +0200)]
Merge branch 'dev' of git.parisson.com:git/teleforma
Guillaume Pellerin [Fri, 13 Jul 2018 10:58:47 +0000 (12:58 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 13 Jul 2018 10:58:33 +0000 (12:58 +0200)]
Filter by period
Guillaume Pellerin [Thu, 5 Jul 2018 15:18:45 +0000 (17:18 +0200)]
Merge branch 'master' of git.parisson.com:git/teleforma
Guillaume Pellerin [Thu, 5 Jul 2018 15:15:53 +0000 (17:15 +0200)]
Merge branch 'master' of git.parisson.com:git/teleforma
Yoan Le Clanche [Thu, 5 Jul 2018 09:38:01 +0000 (11:38 +0200)]
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
Yoan Le Clanche [Thu, 5 Jul 2018 09:37:05 +0000 (11:37 +0200)]
fix : students can not filter scripts anymore
Guillaume Pellerin [Fri, 29 Jun 2018 11:28:38 +0000 (13:28 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 29 Jun 2018 08:57:45 +0000 (10:57 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 29 Jun 2018 08:57:19 +0000 (10:57 +0200)]
Avoid stream_type for audio
Guillaume Pellerin [Thu, 28 Jun 2018 22:28:26 +0000 (00:28 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Thu, 28 Jun 2018 22:27:47 +0000 (00:27 +0200)]
Fix absolute URLs
Yoan Le Clanche [Thu, 28 Jun 2018 15:23:59 +0000 (17:23 +0200)]
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
Yoan Le Clanche [Thu, 28 Jun 2018 15:23:40 +0000 (17:23 +0200)]
Use the new webviewer app to display pdf
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 [Wed, 27 Jun 2018 08:24:33 +0000 (10:24 +0200)]
Add first names and last names
Yoan Le Clanche [Wed, 13 Jun 2018 10:23:50 +0000 (12:23 +0200)]
fix static url and add period field to news
Yoan Le Clanche [Fri, 1 Jun 2018 14:53:45 +0000 (16:53 +0200)]
add news module
Yoan Le Clanche [Thu, 24 May 2018 09:30:40 +0000 (11:30 +0200)]
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
Guillaume Pellerin [Tue, 22 May 2018 21:02:44 +0000 (23:02 +0200)]
Fix script top style
Guillaume Pellerin [Tue, 22 May 2018 21:01:49 +0000 (23:01 +0200)]
Fix course detail listing
Guillaume Pellerin [Tue, 22 May 2018 16:47:08 +0000 (18:47 +0200)]
Add tinymce and quiz to deps and example
Gael Le Mignot [Tue, 22 May 2018 09:02:54 +0000 (11:02 +0200)]
Allowing annals with empty iej
Yoan Le Clanche [Thu, 26 Apr 2018 12:58:55 +0000 (14:58 +0200)]
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
Yoan Le Clanche [Thu, 26 Apr 2018 12:58:39 +0000 (14:58 +0200)]
Add personalized home page and quiz
Guillaume Pellerin [Thu, 26 Apr 2018 09:38:56 +0000 (11:38 +0200)]
Fix more periods
Guillaume Pellerin [Thu, 26 Apr 2018 09:37:40 +0000 (11:37 +0200)]
Fix exam perion for scores
Yoan Le Clanche [Wed, 25 Apr 2018 15:25:39 +0000 (17:25 +0200)]
fix django.db.utils.IntegrityError: (1048, 'Column 'period_id' cannot be null') when running migration
Guillaume Pellerin [Fri, 6 Apr 2018 15:21:37 +0000 (17:21 +0200)]
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
Yoan Le Clanche [Wed, 4 Apr 2018 14:54:44 +0000 (16:54 +0200)]
Documents can now be associated with many periods instead of one.
Guillaume Pellerin [Sat, 24 Mar 2018 18:24:26 +0000 (19:24 +0100)]
Fix score listing
Yoan Le Clanche [Wed, 7 Mar 2018 11:46:29 +0000 (12:46 +0100)]
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
Yoan Le Clanche [Wed, 7 Mar 2018 11:46:23 +0000 (12:46 +0100)]
add filters to scripts list view
Guillaume Pellerin [Thu, 22 Feb 2018 16:56:34 +0000 (17:56 +0100)]
Fix script per period
Guillaume Pellerin [Thu, 1 Feb 2018 11:53:08 +0000 (12:53 +0100)]
Merge branch 'master' into dev
Yoan Le Clanche [Thu, 1 Feb 2018 11:10:30 +0000 (12:10 +0100)]
Merge branch 'master' of git.parisson.com:git/teleforma
Conflicts:
teleforma/views/crfpa.py
Yoan Le Clanche [Thu, 1 Feb 2018 10:50:20 +0000 (11:50 +0100)]
https://trackers.pilotsystems.net/probarreau/0279 https://trackers.pilotsystems.net/probarreau/0280
Guillaume Pellerin [Fri, 26 Jan 2018 08:45:32 +0000 (09:45 +0100)]
Merge branch 'master' into dev
Guillaume Pellerin [Fri, 26 Jan 2018 08:43:40 +0000 (09:43 +0100)]
Fix no script type
Guillaume Pellerin [Fri, 26 Jan 2018 08:44:38 +0000 (09:44 +0100)]
Bugfix
Guillaume Pellerin [Fri, 26 Jan 2018 08:43:40 +0000 (09:43 +0100)]
Fix no script type
Guillaume Pellerin [Fri, 26 Jan 2018 08:38:50 +0000 (09:38 +0100)]
Merge branch 'feature/box' into dev
Guillaume Pellerin [Fri, 26 Jan 2018 00:38:18 +0000 (01:38 +0100)]
Fix margin again
Guillaume Pellerin [Fri, 26 Jan 2018 00:37:23 +0000 (01:37 +0100)]
Fix iframe margin
Guillaume Pellerin [Thu, 25 Jan 2018 23:57:25 +0000 (00:57 +0100)]
Retry uuid
Guillaume Pellerin [Thu, 25 Jan 2018 23:53:39 +0000 (00:53 +0100)]
No use of uuid
Guillaume Pellerin [Thu, 25 Jan 2018 23:50:11 +0000 (00:50 +0100)]
Fix params in url
Guillaume Pellerin [Thu, 25 Jan 2018 23:48:32 +0000 (00:48 +0100)]
Fix params
Guillaume Pellerin [Thu, 25 Jan 2018 23:35:44 +0000 (00:35 +0100)]
Add uuid
Guillaume Pellerin [Thu, 25 Jan 2018 23:29:28 +0000 (00:29 +0100)]
Bugfix
Guillaume Pellerin [Thu, 25 Jan 2018 23:28:46 +0000 (00:28 +0100)]
Script service URL in settings:wq
Guillaume Pellerin [Thu, 25 Jan 2018 23:23:52 +0000 (00:23 +0100)]
Fix script access for superuser
projects / teleforma.git / log