]>
git.parisson.com Git - mezzo.git/log
Emilie [Tue, 28 Mar 2017 15:09:41 +0000 (17:09 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/mezzanine-organization into dev
Guillaume Pellerin [Tue, 28 Mar 2017 15:08:35 +0000 (17:08 +0200)]
use 8022 port
Guillaume Pellerin [Tue, 28 Mar 2017 15:03:00 +0000 (17:03 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 28 Mar 2017 15:01:23 +0000 (17:01 +0200)]
Merge branch 'vertigo' into dev
Emilie [Tue, 28 Mar 2017 14:35:12 +0000 (16:35 +0200)]
[Docker] resetting docker port
Emilie Zawadzki [Tue, 21 Mar 2017 14:59:42 +0000 (15:59 +0100)]
[Event] : add bool to check if event is full
Guillaume Pellerin [Tue, 28 Mar 2017 09:37:19 +0000 (11:37 +0200)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/mezzanine-organization
Emilie [Tue, 28 Mar 2017 09:36:14 +0000 (11:36 +0200)]
resolving conflicts
Emilie [Tue, 28 Mar 2017 09:19:28 +0000 (11:19 +0200)]
[Docker] : deleting port 3000
Guillaume Pellerin [Wed, 22 Mar 2017 23:33:33 +0000 (00:33 +0100)]
Reorganize settings
Guillaume Pellerin [Tue, 28 Mar 2017 09:20:52 +0000 (11:20 +0200)]
Merge branch 'vertigo' of git+ssh://git.forge.ircam.fr/mezzanine-organization into vertigo
Guillaume Pellerin [Thu, 23 Mar 2017 17:48:06 +0000 (18:48 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/mezzanine-organization
Guillaume Pellerin [Thu, 23 Mar 2017 17:46:09 +0000 (18:46 +0100)]
Add auth_basic
Guillaume Pellerin [Thu, 23 Mar 2017 17:12:34 +0000 (18:12 +0100)]
bugfix nginx
Guillaume Pellerin [Thu, 23 Mar 2017 17:08:28 +0000 (18:08 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/mezzanine-organization
Guillaume Pellerin [Thu, 23 Mar 2017 16:46:18 +0000 (17:46 +0100)]
Add info
Guillaume Pellerin [Thu, 23 Mar 2017 16:44:17 +0000 (17:44 +0100)]
Add nginx optional htpasswd access
Guillaume Pellerin [Thu, 23 Mar 2017 17:02:48 +0000 (18:02 +0100)]
Merge remote-tracking branch 'mezzorg/dev'
Guillaume Pellerin [Thu, 23 Mar 2017 16:46:18 +0000 (17:46 +0100)]
Add info
Guillaume Pellerin [Thu, 23 Mar 2017 16:44:17 +0000 (17:44 +0100)]
Add nginx optional htpasswd access
Emilie [Thu, 23 Mar 2017 16:35:12 +0000 (17:35 +0100)]
[NGINX] conf host
Emilie [Thu, 23 Mar 2017 13:49:22 +0000 (14:49 +0100)]
[Docker] env config
Emilie [Thu, 23 Mar 2017 13:36:05 +0000 (14:36 +0100)]
change var repo
Emilie [Thu, 23 Mar 2017 13:35:03 +0000 (14:35 +0100)]
init var
Guillaume Pellerin [Thu, 23 Mar 2017 09:49:35 +0000 (10:49 +0100)]
Add signature to project validation message
Guillaume Pellerin [Thu, 23 Mar 2017 09:39:56 +0000 (10:39 +0100)]
Adapt project model and dates
Guillaume Pellerin [Thu, 23 Mar 2017 08:55:28 +0000 (09:55 +0100)]
Add admin project list data, make project draft after submission
Guillaume Pellerin [Thu, 23 Mar 2017 07:27:16 +0000 (08:27 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Thu, 23 Mar 2017 07:26:43 +0000 (08:26 +0100)]
Project keyword not required
Guillaume Pellerin [Thu, 23 Mar 2017 07:17:47 +0000 (08:17 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/vertigo
Guillaume Pellerin [Thu, 23 Mar 2017 07:17:39 +0000 (08:17 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Thu, 23 Mar 2017 07:17:18 +0000 (08:17 +0100)]
Cleanup Person metadata
Guillaume Pellerin [Wed, 22 Mar 2017 23:35:34 +0000 (00:35 +0100)]
Fix current theme names
Guillaume Pellerin [Wed, 22 Mar 2017 23:33:33 +0000 (00:33 +0100)]
Reorganize settings
Guillaume Pellerin [Wed, 22 Mar 2017 23:28:54 +0000 (00:28 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Guillaume Pellerin [Wed, 22 Mar 2017 23:27:48 +0000 (00:27 +0100)]
Upgrade Project form, makes (almost) every fields required, add organization and position fields
Emilie [Wed, 22 Mar 2017 15:08:14 +0000 (16:08 +0100)]
Generic settings
Emilie [Wed, 22 Mar 2017 10:29:55 +0000 (11:29 +0100)]
Merge remote-tracking branch 'vertigo/master' into merging-vertigo
Emilie [Wed, 22 Mar 2017 09:21:58 +0000 (10:21 +0100)]
Merge branch 'dev'
Emilie [Wed, 22 Mar 2017 09:21:29 +0000 (10:21 +0100)]
[Docker] add build script sh
Emilie [Wed, 22 Mar 2017 09:20:27 +0000 (10:20 +0100)]
deleting useless img
Emilie [Tue, 21 Mar 2017 15:35:28 +0000 (16:35 +0100)]
Merge branch 'dev'
Emilie [Tue, 21 Mar 2017 15:35:21 +0000 (16:35 +0100)]
[Vertigo Starts] moving img file
Emilie [Tue, 21 Mar 2017 10:35:01 +0000 (11:35 +0100)]
Merge branch 'dev'
Emilie [Tue, 21 Mar 2017 10:34:47 +0000 (11:34 +0100)]
[Mezzanine agenda] update past events
Emilie [Tue, 21 Mar 2017 10:01:23 +0000 (11:01 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/vertigo
Emilie [Tue, 21 Mar 2017 10:01:15 +0000 (11:01 +0100)]
Merge branch 'dev'
Emilie [Tue, 21 Mar 2017 10:01:03 +0000 (11:01 +0100)]
[Vertigo M&C] bugfix displayable links
Guillaume Pellerin [Mon, 20 Mar 2017 15:36:14 +0000 (16:36 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/vertigo
Guillaume Pellerin [Mon, 20 Mar 2017 15:35:57 +0000 (16:35 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Guillaume Pellerin [Mon, 20 Mar 2017 15:35:48 +0000 (16:35 +0100)]
Bugfix, cleanup
Emilie [Fri, 17 Mar 2017 10:23:24 +0000 (11:23 +0100)]
Merge branch 'dev'
Emilie [Fri, 17 Mar 2017 10:23:08 +0000 (11:23 +0100)]
[Projects] reverting model (mea culpa)
Guillaume Pellerin [Fri, 17 Mar 2017 09:53:17 +0000 (10:53 +0100)]
Merge branch 'master' into dev
Guillaume Pellerin [Fri, 17 Mar 2017 09:53:11 +0000 (10:53 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Guillaume Pellerin [Fri, 17 Mar 2017 09:52:48 +0000 (10:52 +0100)]
update notes
Emilie [Fri, 17 Mar 2017 09:11:57 +0000 (10:11 +0100)]
Merge branch 'dev'
Emilie [Fri, 17 Mar 2017 09:11:47 +0000 (10:11 +0100)]
[Vertigo M&C] : fix youtube height
Emilie [Thu, 16 Mar 2017 19:53:02 +0000 (20:53 +0100)]
Merge branch 'dev'
Emilie [Thu, 16 Mar 2017 19:52:51 +0000 (20:52 +0100)]
[Vertigo M&C] : disable video meanwhile countdown
Emilie [Thu, 16 Mar 2017 18:35:20 +0000 (19:35 +0100)]
Merge branch 'dev'
Emilie [Thu, 16 Mar 2017 18:35:08 +0000 (19:35 +0100)]
[Vertigo M&C] pin Europe/Paris timezone + improve
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
Emilie [Thu, 16 Mar 2017 14:27:17 +0000 (22:27 +0800)]
[Vertigo M&C] : add 30min at the end
Emilie [Thu, 16 Mar 2017 12:30:46 +0000 (13:30 +0100)]
[Docker] add bower as volume
David Palomares [Thu, 16 Mar 2017 12:45:00 +0000 (13:45 +0100)]
Slides for WP3 Dev Plan
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
Guillaume Pellerin [Thu, 16 Mar 2017 12:41:13 +0000 (13:41 +0100)]
Add remark slide sources
Emilie [Thu, 16 Mar 2017 12:30:46 +0000 (13:30 +0100)]
[Docker] add bower as volume
Emilie [Thu, 16 Mar 2017 12:11:32 +0000 (13:11 +0100)]
[Vertigo M&C] : improve js
Emilie [Wed, 15 Mar 2017 15:18:05 +0000 (16:18 +0100)]
[Vertigo M&C] responsive iframe, overlay, video
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
Emilie [Wed, 15 Mar 2017 13:33:23 +0000 (14:33 +0100)]
[Vertigo M&C] : streaming event queue
Guillaume Pellerin [Wed, 15 Mar 2017 13:13:33 +0000 (14:13 +0100)]
fix translation
Guillaume Pellerin [Wed, 15 Mar 2017 12:47:17 +0000 (13:47 +0100)]
bugfix
Guillaume Pellerin [Wed, 15 Mar 2017 12:46:07 +0000 (13:46 +0100)]
Fix validation email
Guillaume Pellerin [Wed, 15 Mar 2017 11:49:22 +0000 (12:49 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 15 Mar 2017 11:49:15 +0000 (12:49 +0100)]
update streams url
Emilie [Wed, 15 Mar 2017 11:35:35 +0000 (12:35 +0100)]
Merge branch 'dev'
Emilie [Wed, 15 Mar 2017 11:35:27 +0000 (12:35 +0100)]
[Vertigo M&C] : deleting console log
Emilie [Wed, 15 Mar 2017 11:32:56 +0000 (12:32 +0100)]
Merge branch 'dev'
Emilie [Wed, 15 Mar 2017 11:32:47 +0000 (12:32 +0100)]
[Vertigo M&C] : streaming begin + end for one event
Emilie [Wed, 15 Mar 2017 11:09:53 +0000 (12:09 +0100)]
Merge branch 'dev'
Emilie [Wed, 15 Mar 2017 11:09:43 +0000 (12:09 +0100)]
[Mutation M&C] little bug on countdown
Emilie [Wed, 15 Mar 2017 10:59:01 +0000 (11:59 +0100)]
œMerge branch 'dev'
Emilie [Wed, 15 Mar 2017 10:58:53 +0000 (11:58 +0100)]
[Vertigo M&C] : css
Emilie [Wed, 15 Mar 2017 10:50:48 +0000 (11:50 +0100)]
Merge branch 'dev'
Emilie [Wed, 15 Mar 2017 10:50:40 +0000 (11:50 +0100)]
[Vertigo M&C] live streaming > url to switch
Emilie [Wed, 15 Mar 2017 09:27:13 +0000 (10:27 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/vertigo
Emilie [Wed, 15 Mar 2017 09:27:01 +0000 (10:27 +0100)]
Merge branch '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
Emilie [Wed, 15 Mar 2017 09:26:22 +0000 (10:26 +0100)]
[Vertigo M&C] live streaming
Guillaume Pellerin [Tue, 14 Mar 2017 22:42:43 +0000 (23:42 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 14 Mar 2017 22:42:31 +0000 (23:42 +0100)]
Add validation info
Guillaume Pellerin [Tue, 14 Mar 2017 18:25:36 +0000 (19:25 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 14 Mar 2017 18:24:54 +0000 (19:24 +0100)]
Change user files paths
Guillaume Pellerin [Tue, 14 Mar 2017 17:40:42 +0000 (18:40 +0100)]
Add blank video, add JS counter
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
Guillaume Pellerin [Tue, 14 Mar 2017 17:29:06 +0000 (18:29 +0100)]
Add LiveStreaming MVC
Guillaume Pellerin [Tue, 14 Mar 2017 17:02:44 +0000 (18:02 +0100)]
fix call input
projects / mezzo.git / log