]> git.parisson.com Git - mezzo.git/log
mezzo.git
8 years agoMerge branch 'dev'
Emilie [Fri, 17 Mar 2017 09:11:57 +0000 (10:11 +0100)]
Merge branch 'dev'

8 years ago[Vertigo M&C] : fix youtube height
Emilie [Fri, 17 Mar 2017 09:11:47 +0000 (10:11 +0100)]
[Vertigo M&C] : fix youtube height

8 years agoMerge branch 'dev'
Emilie [Thu, 16 Mar 2017 19:53:02 +0000 (20:53 +0100)]
Merge branch 'dev'

8 years ago[Vertigo M&C] : disable video meanwhile countdown
Emilie [Thu, 16 Mar 2017 19:52:51 +0000 (20:52 +0100)]
[Vertigo M&C] : disable video meanwhile countdown

8 years agoMerge branch 'dev'
Emilie [Thu, 16 Mar 2017 18:35:20 +0000 (19:35 +0100)]
Merge branch 'dev'

8 years ago[Vertigo M&C] pin Europe/Paris timezone + improve
Emilie [Thu, 16 Mar 2017 18:35:08 +0000 (19:35 +0100)]
[Vertigo M&C] pin Europe/Paris timezone + improve

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Thu, 16 Mar 2017 14:27:28 +0000 (22:27 +0800)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years ago[Vertigo M&C] : add 30min at the end
Emilie [Thu, 16 Mar 2017 14:27:17 +0000 (22:27 +0800)]
[Vertigo M&C] : add 30min at the end

8 years ago[Docker] add bower as volume
Emilie [Thu, 16 Mar 2017 12:30:46 +0000 (13:30 +0100)]
[Docker] add bower as volume

8 years agoSlides for WP3 Dev Plan
David Palomares [Thu, 16 Mar 2017 12:45:00 +0000 (13:45 +0100)]
Slides for WP3 Dev Plan

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Guillaume Pellerin [Thu, 16 Mar 2017 12:41:49 +0000 (13:41 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years agoAdd remark slide sources
Guillaume Pellerin [Thu, 16 Mar 2017 12:41:13 +0000 (13:41 +0100)]
Add remark slide sources

8 years ago[Docker] add bower as volume
Emilie [Thu, 16 Mar 2017 12:30:46 +0000 (13:30 +0100)]
[Docker] add bower as volume

8 years ago[Vertigo M&C] : improve js
Emilie [Thu, 16 Mar 2017 12:11:32 +0000 (13:11 +0100)]
[Vertigo M&C] : improve js

8 years ago[Vertigo M&C] responsive iframe, overlay, video
Emilie [Wed, 15 Mar 2017 15:18:05 +0000 (16:18 +0100)]
[Vertigo M&C] responsive iframe, overlay, video

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Wed, 15 Mar 2017 13:33:28 +0000 (14:33 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years ago[Vertigo M&C] : streaming event queue
Emilie [Wed, 15 Mar 2017 13:33:23 +0000 (14:33 +0100)]
[Vertigo M&C] : streaming event queue

8 years agofix translation
Guillaume Pellerin [Wed, 15 Mar 2017 13:13:33 +0000 (14:13 +0100)]
fix translation

8 years agobugfix
Guillaume Pellerin [Wed, 15 Mar 2017 12:47:17 +0000 (13:47 +0100)]
bugfix

8 years agoFix validation email
Guillaume Pellerin [Wed, 15 Mar 2017 12:46:07 +0000 (13:46 +0100)]
Fix validation email

8 years agoMerge branch 'dev'
Guillaume Pellerin [Wed, 15 Mar 2017 11:49:22 +0000 (12:49 +0100)]
Merge branch 'dev'

8 years agoupdate streams url
Guillaume Pellerin [Wed, 15 Mar 2017 11:49:15 +0000 (12:49 +0100)]
update streams url

8 years agoMerge branch 'dev'
Emilie [Wed, 15 Mar 2017 11:35:35 +0000 (12:35 +0100)]
Merge branch 'dev'

8 years ago[Vertigo M&C] : deleting console log
Emilie [Wed, 15 Mar 2017 11:35:27 +0000 (12:35 +0100)]
[Vertigo M&C] : deleting console log

8 years agoMerge branch 'dev'
Emilie [Wed, 15 Mar 2017 11:32:56 +0000 (12:32 +0100)]
Merge branch 'dev'

8 years ago[Vertigo M&C] : streaming begin + end for one event
Emilie [Wed, 15 Mar 2017 11:32:47 +0000 (12:32 +0100)]
[Vertigo M&C] : streaming begin + end for one event

8 years agoMerge branch 'dev'
Emilie [Wed, 15 Mar 2017 11:09:53 +0000 (12:09 +0100)]
Merge branch 'dev'

8 years ago[Mutation M&C] little bug on countdown
Emilie [Wed, 15 Mar 2017 11:09:43 +0000 (12:09 +0100)]
[Mutation M&C] little bug on countdown

8 years agoœMerge branch 'dev'
Emilie [Wed, 15 Mar 2017 10:59:01 +0000 (11:59 +0100)]
œMerge branch 'dev'

8 years ago[Vertigo M&C] : css
Emilie [Wed, 15 Mar 2017 10:58:53 +0000 (11:58 +0100)]
[Vertigo M&C] : css

8 years agoMerge branch 'dev'
Emilie [Wed, 15 Mar 2017 10:50:48 +0000 (11:50 +0100)]
Merge branch 'dev'

8 years ago[Vertigo M&C] live streaming > url to switch
Emilie [Wed, 15 Mar 2017 10:50:40 +0000 (11:50 +0100)]
[Vertigo M&C] live streaming > url to switch

8 years agoMerge branch 'master' of git+ssh://git.forge.ircam.fr/vertigo
Emilie [Wed, 15 Mar 2017 09:27:13 +0000 (10:27 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/vertigo

8 years agoMerge branch 'dev'
Emilie [Wed, 15 Mar 2017 09:27:01 +0000 (10:27 +0100)]
Merge branch 'dev'

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Wed, 15 Mar 2017 09:26:32 +0000 (10:26 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years ago[Vertigo M&C] live streaming
Emilie [Wed, 15 Mar 2017 09:26:22 +0000 (10:26 +0100)]
[Vertigo M&C] live streaming

8 years agoMerge branch 'dev'
Guillaume Pellerin [Tue, 14 Mar 2017 22:42:43 +0000 (23:42 +0100)]
Merge branch 'dev'

8 years agoAdd validation info
Guillaume Pellerin [Tue, 14 Mar 2017 22:42:31 +0000 (23:42 +0100)]
Add validation info

8 years agoMerge branch 'dev'
Guillaume Pellerin [Tue, 14 Mar 2017 18:25:36 +0000 (19:25 +0100)]
Merge branch 'dev'

8 years agoChange user files paths
Guillaume Pellerin [Tue, 14 Mar 2017 18:24:54 +0000 (19:24 +0100)]
Change user files paths

8 years agoAdd blank video, add JS counter
Guillaume Pellerin [Tue, 14 Mar 2017 17:40:42 +0000 (18:40 +0100)]
Add blank video, add JS counter

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Guillaume Pellerin [Tue, 14 Mar 2017 17:29:23 +0000 (18:29 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years agoAdd LiveStreaming MVC
Guillaume Pellerin [Tue, 14 Mar 2017 17:29:06 +0000 (18:29 +0100)]
Add LiveStreaming MVC

8 years agofix call input
Guillaume Pellerin [Tue, 14 Mar 2017 17:02:44 +0000 (18:02 +0100)]
fix call input

8 years agoMerge branch 'master' of git+ssh://git.forge.ircam.fr/vertigo
Guillaume Pellerin [Tue, 14 Mar 2017 16:57:05 +0000 (17:57 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/vertigo

8 years agoFix form multipart
Guillaume Pellerin [Tue, 14 Mar 2017 16:56:17 +0000 (17:56 +0100)]
Fix form multipart

8 years agoMerge branch 'dev'
Emilie [Tue, 14 Mar 2017 16:52:23 +0000 (17:52 +0100)]
Merge branch 'dev'

8 years ago[Vertigo EU] form url field
Emilie [Tue, 14 Mar 2017 16:50:19 +0000 (17:50 +0100)]
[Vertigo EU] form url field

8 years ago[Vertigo EU] home: disable body
Emilie [Tue, 14 Mar 2017 16:21:40 +0000 (17:21 +0100)]
[Vertigo EU] home: disable body

8 years ago[Vertigo EU] change title
Emilie [Tue, 14 Mar 2017 16:18:56 +0000 (17:18 +0100)]
[Vertigo EU] change title

8 years agoversionning static img
Emilie [Tue, 14 Mar 2017 15:57:30 +0000 (16:57 +0100)]
versionning static img

8 years ago[Vertigo EU] home: disable body
Emilie [Tue, 14 Mar 2017 16:21:40 +0000 (17:21 +0100)]
[Vertigo EU] home: disable body

8 years ago[Vertigo EU] change title
Emilie [Tue, 14 Mar 2017 16:18:56 +0000 (17:18 +0100)]
[Vertigo EU] change title

8 years agoversionning static img
Emilie [Tue, 14 Mar 2017 15:57:30 +0000 (16:57 +0100)]
versionning static img

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Tue, 14 Mar 2017 15:34:13 +0000 (16:34 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years ago[Vertigo EU] : home positionning title
Emilie [Tue, 14 Mar 2017 15:34:02 +0000 (16:34 +0100)]
[Vertigo EU] : home positionning title

8 years agoMerge branch 'master' of git+ssh://git.forge.ircam.fr/vertigo
Guillaume Pellerin [Tue, 14 Mar 2017 14:13:18 +0000 (15:13 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/vertigo

8 years agoFix project form
Guillaume Pellerin [Tue, 14 Mar 2017 14:13:10 +0000 (15:13 +0100)]
Fix project form

8 years agodeleting canvas
Emilie [Tue, 14 Mar 2017 13:50:02 +0000 (14:50 +0100)]
deleting canvas

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Tue, 14 Mar 2017 13:32:23 +0000 (14:32 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years ago[Vertigo] : margin logo
Emilie [Tue, 14 Mar 2017 13:32:08 +0000 (14:32 +0100)]
[Vertigo] : margin logo

8 years agoUse local mezzanine module
Guillaume Pellerin [Tue, 14 Mar 2017 13:24:47 +0000 (14:24 +0100)]
Use local mezzanine module

8 years agoHack original sent URLs :'(
Guillaume Pellerin [Tue, 14 Mar 2017 12:01:01 +0000 (13:01 +0100)]
Hack original sent URLs :'(

8 years ago[Vertigo] add images to home
Emilie [Tue, 14 Mar 2017 11:52:19 +0000 (12:52 +0100)]
[Vertigo] add images to home

8 years agofix projectdata max_num
Guillaume Pellerin [Tue, 14 Mar 2017 11:50:09 +0000 (12:50 +0100)]
fix projectdata max_num

8 years agobugfix
Guillaume Pellerin [Tue, 14 Mar 2017 11:45:10 +0000 (12:45 +0100)]
bugfix

8 years agoBugfix
Guillaume Pellerin [Tue, 14 Mar 2017 11:44:15 +0000 (12:44 +0100)]
Bugfix

8 years agoHack submission project url
Guillaume Pellerin [Tue, 14 Mar 2017 11:42:21 +0000 (12:42 +0100)]
Hack submission project url

8 years agoFix project form
Guillaume Pellerin [Tue, 14 Mar 2017 11:30:28 +0000 (12:30 +0100)]
Fix project form

8 years agoFix various form and inlines, modufy project submission workflow
Guillaume Pellerin [Tue, 14 Mar 2017 09:57:52 +0000 (10:57 +0100)]
Fix various form and inlines, modufy project submission workflow

8 years agoAdd Organization.role, update ProducerCreateView, rename SimpleImage to UserImage
Guillaume Pellerin [Mon, 13 Mar 2017 11:27:21 +0000 (12:27 +0100)]
Add Organization.role, update ProducerCreateView, rename SimpleImage to UserImage

8 years agoUpdate form title, use cri user for cron rules, en locale by default
Guillaume Pellerin [Fri, 10 Mar 2017 18:06:43 +0000 (19:06 +0100)]
Update form title, use cri user for cron rules, en locale by default

8 years agoupdate Project form
Guillaume Pellerin [Fri, 10 Mar 2017 17:08:40 +0000 (18:08 +0100)]
update Project form

8 years agofix cron time
Guillaume Pellerin [Fri, 10 Mar 2017 13:09:31 +0000 (14:09 +0100)]
fix cron time

8 years agofix chmod
Guillaume Pellerin [Fri, 10 Mar 2017 13:06:40 +0000 (14:06 +0100)]
fix chmod

8 years agoFix log paths
Guillaume Pellerin [Fri, 10 Mar 2017 13:04:53 +0000 (14:04 +0100)]
Fix log paths

8 years agofix PATH again
Guillaume Pellerin [Fri, 10 Mar 2017 13:02:05 +0000 (14:02 +0100)]
fix PATH again

8 years agoFix cron PATH
Guillaume Pellerin [Fri, 10 Mar 2017 13:00:46 +0000 (14:00 +0100)]
Fix cron PATH

8 years agoupdate cron chmod
Guillaume Pellerin [Fri, 10 Mar 2017 12:36:48 +0000 (13:36 +0100)]
update cron chmod

8 years agoAdd cron rules as a symlink to app own cron file
Guillaume Pellerin [Fri, 10 Mar 2017 12:29:31 +0000 (13:29 +0100)]
Add cron rules as a symlink to app own cron file

8 years agoAdd crontab commands
Guillaume Pellerin [Fri, 10 Mar 2017 12:13:48 +0000 (13:13 +0100)]
Add crontab commands

8 years agoMerge branch 'dev'
Guillaume Pellerin [Wed, 8 Mar 2017 17:34:41 +0000 (18:34 +0100)]
Merge branch 'dev'

8 years agoFix nginx paths
Guillaume Pellerin [Wed, 8 Mar 2017 17:34:27 +0000 (18:34 +0100)]
Fix nginx paths

8 years agoMerge branch 'dev'
Guillaume Pellerin [Wed, 8 Mar 2017 17:13:07 +0000 (18:13 +0100)]
Merge branch 'dev'

8 years agoFix media.urls, pin bleach==1.5.0
Guillaume Pellerin [Wed, 8 Mar 2017 17:12:36 +0000 (18:12 +0100)]
Fix media.urls, pin bleach==1.5.0

8 years agoFix urls
Guillaume Pellerin [Tue, 7 Mar 2017 16:31:15 +0000 (17:31 +0100)]
Fix urls

8 years agoMerge branch 'dev'
Guillaume Pellerin [Tue, 7 Mar 2017 15:53:40 +0000 (16:53 +0100)]
Merge branch 'dev'

8 years agoUpdate ProjectCall, add Residency and ProjectProducer, add related templates
Guillaume Pellerin [Tue, 7 Mar 2017 15:51:51 +0000 (16:51 +0100)]
Update ProjectCall, add Residency and ProjectProducer, add related templates

8 years agofix server_name, fix starts.eu logo
Guillaume Pellerin [Mon, 6 Mar 2017 12:12:14 +0000 (13:12 +0100)]
fix server_name, fix starts.eu logo

8 years agoMerge branch 'dev'
Guillaume Pellerin [Mon, 6 Mar 2017 11:55:54 +0000 (12:55 +0100)]
Merge branch 'dev'

8 years agoadd nginx redirect
Guillaume Pellerin [Mon, 6 Mar 2017 11:55:42 +0000 (12:55 +0100)]
add nginx redirect

8 years agouse www
Guillaume Pellerin [Mon, 6 Mar 2017 11:51:23 +0000 (12:51 +0100)]
use www

8 years agoMerge branch 'dev'
Guillaume Pellerin [Mon, 6 Mar 2017 09:53:29 +0000 (10:53 +0100)]
Merge branch 'dev'

8 years agoNo logo width constraints
Guillaume Pellerin [Mon, 6 Mar 2017 09:53:03 +0000 (10:53 +0100)]
No logo width constraints

8 years agoMerge branch 'dev'
Guillaume Pellerin [Fri, 3 Mar 2017 17:44:36 +0000 (18:44 +0100)]
Merge branch 'dev'

8 years agono cron container ATM
Guillaume Pellerin [Fri, 3 Mar 2017 17:44:24 +0000 (18:44 +0100)]
no cron container ATM

8 years agoMerge branch 'dev'
Guillaume Pellerin [Fri, 3 Mar 2017 17:28:16 +0000 (18:28 +0100)]
Merge branch 'dev'

8 years agoNo ProjectCall ATM
Guillaume Pellerin [Fri, 3 Mar 2017 17:28:06 +0000 (18:28 +0100)]
No ProjectCall ATM

8 years agoMerge branch 'dev'
Guillaume Pellerin [Fri, 3 Mar 2017 17:25:25 +0000 (18:25 +0100)]
Merge branch 'dev'

8 years agoadd Project ICT data and related content, first version of ICT Project form, take...
Guillaume Pellerin [Fri, 3 Mar 2017 17:22:29 +0000 (18:22 +0100)]
add Project ICT data and related content, first version of ICT Project form, take host organization from current site