]>
git.parisson.com Git - mezzo.git/log
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
Guillaume Pellerin [Tue, 14 Mar 2017 16:57:05 +0000 (17:57 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/vertigo
Guillaume Pellerin [Tue, 14 Mar 2017 16:56:17 +0000 (17:56 +0100)]
Fix form multipart
Emilie [Tue, 14 Mar 2017 16:52:23 +0000 (17:52 +0100)]
Merge branch 'dev'
Emilie [Tue, 14 Mar 2017 16:50:19 +0000 (17:50 +0100)]
[Vertigo EU] form url field
Emilie [Tue, 14 Mar 2017 16:21:40 +0000 (17:21 +0100)]
[Vertigo EU] home: disable body
Emilie [Tue, 14 Mar 2017 16:18:56 +0000 (17:18 +0100)]
[Vertigo EU] change title
Emilie [Tue, 14 Mar 2017 15:57:30 +0000 (16:57 +0100)]
versionning static img
Emilie [Tue, 14 Mar 2017 16:21:40 +0000 (17:21 +0100)]
[Vertigo EU] home: disable body
Emilie [Tue, 14 Mar 2017 16:18:56 +0000 (17:18 +0100)]
[Vertigo EU] change title
Emilie [Tue, 14 Mar 2017 15:57:30 +0000 (16:57 +0100)]
versionning static img
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
Emilie [Tue, 14 Mar 2017 15:34:02 +0000 (16:34 +0100)]
[Vertigo EU] : home positionning title
Guillaume Pellerin [Tue, 14 Mar 2017 14:13:18 +0000 (15:13 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/vertigo
Guillaume Pellerin [Tue, 14 Mar 2017 14:13:10 +0000 (15:13 +0100)]
Fix project form
Emilie [Tue, 14 Mar 2017 13:50:02 +0000 (14:50 +0100)]
deleting canvas
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
Emilie [Tue, 14 Mar 2017 13:32:08 +0000 (14:32 +0100)]
[Vertigo] : margin logo
Guillaume Pellerin [Tue, 14 Mar 2017 13:24:47 +0000 (14:24 +0100)]
Use local mezzanine module
Guillaume Pellerin [Tue, 14 Mar 2017 12:01:01 +0000 (13:01 +0100)]
Hack original sent URLs :'(
Emilie [Tue, 14 Mar 2017 11:52:19 +0000 (12:52 +0100)]
[Vertigo] add images to home
Guillaume Pellerin [Tue, 14 Mar 2017 11:50:09 +0000 (12:50 +0100)]
fix projectdata max_num
Guillaume Pellerin [Tue, 14 Mar 2017 11:45:10 +0000 (12:45 +0100)]
bugfix
Guillaume Pellerin [Tue, 14 Mar 2017 11:44:15 +0000 (12:44 +0100)]
Bugfix
Guillaume Pellerin [Tue, 14 Mar 2017 11:42:21 +0000 (12:42 +0100)]
Hack submission project url
Guillaume Pellerin [Tue, 14 Mar 2017 11:30:28 +0000 (12:30 +0100)]
Fix project form
Guillaume Pellerin [Tue, 14 Mar 2017 09:57:52 +0000 (10:57 +0100)]
Fix various form and inlines, modufy project submission workflow
Guillaume Pellerin [Mon, 13 Mar 2017 11:27:21 +0000 (12:27 +0100)]
Add Organization.role, update ProducerCreateView, rename SimpleImage to UserImage
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
Guillaume Pellerin [Fri, 10 Mar 2017 17:08:40 +0000 (18:08 +0100)]
update Project form
Guillaume Pellerin [Fri, 10 Mar 2017 13:09:31 +0000 (14:09 +0100)]
fix cron time
Guillaume Pellerin [Fri, 10 Mar 2017 13:06:40 +0000 (14:06 +0100)]
fix chmod
Guillaume Pellerin [Fri, 10 Mar 2017 13:04:53 +0000 (14:04 +0100)]
Fix log paths
Guillaume Pellerin [Fri, 10 Mar 2017 13:02:05 +0000 (14:02 +0100)]
fix PATH again
Guillaume Pellerin [Fri, 10 Mar 2017 13:00:46 +0000 (14:00 +0100)]
Fix cron PATH
Guillaume Pellerin [Fri, 10 Mar 2017 12:36:48 +0000 (13:36 +0100)]
update cron chmod
Guillaume Pellerin [Fri, 10 Mar 2017 12:29:31 +0000 (13:29 +0100)]
Add cron rules as a symlink to app own cron file
Guillaume Pellerin [Fri, 10 Mar 2017 12:13:48 +0000 (13:13 +0100)]
Add crontab commands
Guillaume Pellerin [Wed, 8 Mar 2017 17:34:41 +0000 (18:34 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 8 Mar 2017 17:34:27 +0000 (18:34 +0100)]
Fix nginx paths
Guillaume Pellerin [Wed, 8 Mar 2017 17:13:07 +0000 (18:13 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 8 Mar 2017 17:12:36 +0000 (18:12 +0100)]
Fix media.urls, pin bleach==1.5.0
Guillaume Pellerin [Tue, 7 Mar 2017 16:31:15 +0000 (17:31 +0100)]
Fix urls
Guillaume Pellerin [Tue, 7 Mar 2017 15:53:40 +0000 (16:53 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 7 Mar 2017 15:51:51 +0000 (16:51 +0100)]
Update ProjectCall, add Residency and ProjectProducer, add related templates
Guillaume Pellerin [Mon, 6 Mar 2017 12:12:14 +0000 (13:12 +0100)]
fix server_name, fix starts.eu logo
Guillaume Pellerin [Mon, 6 Mar 2017 11:55:54 +0000 (12:55 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Mon, 6 Mar 2017 11:55:42 +0000 (12:55 +0100)]
add nginx redirect
Guillaume Pellerin [Mon, 6 Mar 2017 11:51:23 +0000 (12:51 +0100)]
use www
Guillaume Pellerin [Mon, 6 Mar 2017 09:53:29 +0000 (10:53 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Mon, 6 Mar 2017 09:53:03 +0000 (10:53 +0100)]
No logo width constraints
Guillaume Pellerin [Fri, 3 Mar 2017 17:44:36 +0000 (18:44 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 3 Mar 2017 17:44:24 +0000 (18:44 +0100)]
no cron container ATM
Guillaume Pellerin [Fri, 3 Mar 2017 17:28:16 +0000 (18:28 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 3 Mar 2017 17:28:06 +0000 (18:28 +0100)]
No ProjectCall ATM
Guillaume Pellerin [Fri, 3 Mar 2017 17:25:25 +0000 (18:25 +0100)]
Merge branch 'dev'
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
David Palomares [Thu, 2 Mar 2017 16:43:50 +0000 (17:43 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
David Palomares [Thu, 2 Mar 2017 16:42:56 +0000 (17:42 +0100)]
ICTProject model and admin
Guillaume Pellerin [Tue, 28 Feb 2017 17:38:41 +0000 (18:38 +0100)]
Fix dev modules
Guillaume Pellerin [Mon, 27 Feb 2017 14:13:25 +0000 (15:13 +0100)]
add (empty) crontab
Guillaume Pellerin [Mon, 27 Feb 2017 14:13:25 +0000 (15:13 +0100)]
add (empty) crontab
Guillaume Pellerin [Mon, 27 Feb 2017 10:01:47 +0000 (11:01 +0100)]
Full media update, not only on creation (fix #135)
Guillaume Pellerin [Fri, 24 Feb 2017 12:45:13 +0000 (13:45 +0100)]
static files in host dir
Guillaume Pellerin [Fri, 24 Feb 2017 12:39:26 +0000 (13:39 +0100)]
Fix zoom
Guillaume Pellerin [Thu, 23 Feb 2017 22:55:41 +0000 (23:55 +0100)]
Merge branch 'feature/themes' into dev
Guillaume Pellerin [Thu, 23 Feb 2017 22:53:49 +0000 (23:53 +0100)]
Add organization.site to allow host orga filtering by site
Guillaume Pellerin [Thu, 23 Feb 2017 22:45:23 +0000 (23:45 +0100)]
Fix themes init, fix page placeholder names
Guillaume Pellerin [Thu, 23 Feb 2017 17:28:49 +0000 (18:28 +0100)]
Add starts_eu theme
Guillaume Pellerin [Thu, 23 Feb 2017 16:46:04 +0000 (17:46 +0100)]
Get first host_theme for vertigo.starts.eu, adapt front builder to new paths
Guillaume Pellerin [Thu, 23 Feb 2017 15:48:31 +0000 (16:48 +0100)]
Merge branch 'dev' into feature/themes
Guillaume Pellerin [Thu, 23 Feb 2017 15:47:49 +0000 (16:47 +0100)]
Add themes modules plus custom base.html and page.html
Guillaume Pellerin [Wed, 22 Feb 2017 14:17:20 +0000 (15:17 +0100)]
update locales
Guillaume Pellerin [Wed, 22 Feb 2017 14:13:42 +0000 (15:13 +0100)]
Merge branch 'patch-3' into dev
Conflicts:
app/locale/fr/LC_MESSAGES/django.po
Guillaume Pellerin [Wed, 22 Feb 2017 14:10:29 +0000 (15:10 +0100)]
Merge branch 'dev' of gitlab.com:yomguy/vertigo into dev
Guillaume Pellerin [Wed, 22 Feb 2017 14:09:39 +0000 (14:09 +0000)]
Merge branch 'patch-2' into 'dev'
Update django.po
See merge request !2
Jérémy Fabre [Wed, 22 Feb 2017 13:30:22 +0000 (14:30 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Wed, 22 Feb 2017 13:30:11 +0000 (14:30 +0100)]
Exclude events from related content, move them to another container
Guillaume Pellerin [Wed, 22 Feb 2017 12:36:29 +0000 (13:36 +0100)]
Fix spaces
Guillaume Pellerin [Wed, 22 Feb 2017 12:35:40 +0000 (13:35 +0100)]
Add twitter user links
Guillaume Pellerin [Wed, 22 Feb 2017 12:30:44 +0000 (13:30 +0100)]
Use retweet when available
Emilie [Wed, 22 Feb 2017 12:01:47 +0000 (13:01 +0100)]
[CustomPage] : separate events from other dynamic content
Emilie [Wed, 22 Feb 2017 10:40:25 +0000 (11:40 +0100)]
[Event] : keep admin view
Emilie [Wed, 22 Feb 2017 10:27:54 +0000 (11:27 +0100)]
[Docker] : add volume mezzanine-agenda
Emilie [Wed, 22 Feb 2017 10:22:44 +0000 (11:22 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
projects / mezzo.git / log