]>
git.parisson.com Git - mezzo.git/log
Guillaume Pellerin [Tue, 14 Feb 2017 13:08:42 +0000 (14:08 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Guillaume Pellerin [Tue, 14 Feb 2017 13:07:55 +0000 (14:07 +0100)]
Fix absolute media url by adding a type property (Fix #114)
Jérémy Fabre [Tue, 14 Feb 2017 13:05:25 +0000 (14:05 +0100)]
Past events style
Jérémy Fabre [Tue, 14 Feb 2017 12:58:38 +0000 (13:58 +0100)]
Add 6 posts to Instagram feed. Add a link to Instagram #ircam tag.
Jérémy Fabre [Tue, 14 Feb 2017 12:58:16 +0000 (13:58 +0100)]
Update favicon
Emilie [Tue, 14 Feb 2017 12:42:58 +0000 (13:42 +0100)]
[Event] : change agenda url
Emilie [Tue, 14 Feb 2017 11:29:39 +0000 (12:29 +0100)]
[Article] : can add Person in related content
Emilie [Tue, 14 Feb 2017 11:11:00 +0000 (12:11 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Tue, 14 Feb 2017 11:10:52 +0000 (12:10 +0100)]
[Event] : list archives on the same page
Jérémy Fabre [Tue, 14 Feb 2017 10:57:13 +0000 (11:57 +0100)]
Fix footer section title margin
Jérémy Fabre [Tue, 14 Feb 2017 10:53:05 +0000 (11:53 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Tue, 14 Feb 2017 10:52:53 +0000 (11:52 +0100)]
Update related content. Now related content is displayed as a slider.
Emilie [Tue, 14 Feb 2017 10:22:49 +0000 (11:22 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Tue, 14 Feb 2017 10:22:43 +0000 (11:22 +0100)]
[Media] : playlist overlay
Jérémy Fabre [Tue, 14 Feb 2017 09:47:31 +0000 (10:47 +0100)]
Same height on article/media boxes
Jérémy Fabre [Tue, 14 Feb 2017 09:31:07 +0000 (10:31 +0100)]
Update black page block style
Jérémy Fabre [Tue, 14 Feb 2017 09:28:59 +0000 (10:28 +0100)]
Update h3 style
Jérémy Fabre [Tue, 14 Feb 2017 09:24:51 +0000 (10:24 +0100)]
Update Instagram feed with a slider
Jérémy Fabre [Tue, 14 Feb 2017 08:49:31 +0000 (09:49 +0100)]
Autoplay video when overlay opens
Emilie [Mon, 13 Feb 2017 15:44:08 +0000 (16:44 +0100)]
[Home] : instagram ok
Emilie [Mon, 13 Feb 2017 14:37:50 +0000 (15:37 +0100)]
[Person] : deactivating autocomplete on person list in admin
Emilie [Mon, 13 Feb 2017 11:00:16 +0000 (12:00 +0100)]
[Event] : add archives
Jérémy Fabre [Fri, 10 Feb 2017 09:38:52 +0000 (10:38 +0100)]
Video overlay now stop when closed. Added a spinner.
Jérémy Fabre [Thu, 9 Feb 2017 18:04:19 +0000 (19:04 +0100)]
Add an active state to the header menu item links
Jérémy Fabre [Thu, 9 Feb 2017 17:55:23 +0000 (18:55 +0100)]
Update block separators
Jérémy Fabre [Thu, 9 Feb 2017 17:23:52 +0000 (18:23 +0100)]
Video overlay first implementation
Jérémy Fabre [Thu, 9 Feb 2017 17:23:33 +0000 (18:23 +0100)]
Red booking button
Jérémy Fabre [Thu, 9 Feb 2017 16:39:32 +0000 (17:39 +0100)]
Update video details template
Jérémy Fabre [Thu, 9 Feb 2017 16:23:54 +0000 (17:23 +0100)]
Update search results page
Jérémy Fabre [Thu, 9 Feb 2017 16:23:39 +0000 (17:23 +0100)]
Update docker-compose file
Jérémy Fabre [Thu, 9 Feb 2017 16:22:37 +0000 (17:22 +0100)]
Add a gradient on event line boxes
Jérémy Fabre [Thu, 9 Feb 2017 16:21:55 +0000 (17:21 +0100)]
Add a new map style for testing
Jérémy Fabre [Thu, 9 Feb 2017 14:44:04 +0000 (15:44 +0100)]
Update network map legend
Jérémy Fabre [Thu, 9 Feb 2017 14:43:47 +0000 (15:43 +0100)]
Fixed header
Jérémy Fabre [Thu, 9 Feb 2017 14:35:24 +0000 (15:35 +0100)]
Network map
Jérémy Fabre [Thu, 9 Feb 2017 14:10:31 +0000 (15:10 +0100)]
Update article details
Jérémy Fabre [Thu, 9 Feb 2017 11:28:55 +0000 (12:28 +0100)]
Custom page templates. Overrides the mutations-creations template to include the hero.
Jérémy Fabre [Thu, 9 Feb 2017 09:56:27 +0000 (10:56 +0100)]
Fix link color in pages
Jérémy Fabre [Thu, 9 Feb 2017 09:31:48 +0000 (10:31 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Thu, 9 Feb 2017 09:31:33 +0000 (10:31 +0100)]
Update Twitter feed on mobile devices
Jérémy Fabre [Thu, 9 Feb 2017 09:31:22 +0000 (10:31 +0100)]
Fix margin on sections
Emilie [Wed, 8 Feb 2017 17:23:53 +0000 (18:23 +0100)]
[Video] : add video detail
Emilie [Wed, 8 Feb 2017 14:54:43 +0000 (15:54 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Wed, 8 Feb 2017 14:54:38 +0000 (15:54 +0100)]
[Actualité] : create view mixing Articles and Medias
Jérémy Fabre [Wed, 8 Feb 2017 12:32:38 +0000 (13:32 +0100)]
Update playlist video inside pages
Jérémy Fabre [Wed, 8 Feb 2017 12:21:57 +0000 (13:21 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Wed, 8 Feb 2017 12:21:45 +0000 (13:21 +0100)]
Update event details page
Emilie [Wed, 8 Feb 2017 11:28:48 +0000 (12:28 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Wed, 8 Feb 2017 11:28:43 +0000 (12:28 +0100)]
delete typo error
Jérémy Fabre [Wed, 8 Feb 2017 11:27:53 +0000 (12:27 +0100)]
Update event list display on mobile devices
Jérémy Fabre [Wed, 8 Feb 2017 11:16:50 +0000 (12:16 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Wed, 8 Feb 2017 11:15:55 +0000 (12:15 +0100)]
Custompage and event list first implementation
Emilie [Wed, 8 Feb 2017 10:35:46 +0000 (11:35 +0100)]
[Video] overlay template
Emilie [Wed, 8 Feb 2017 10:00:02 +0000 (11:00 +0100)]
[docker] mount gulpfile as a volume
Jérémy Fabre [Wed, 8 Feb 2017 09:25:06 +0000 (10:25 +0100)]
Add Twitter feeds styling
Jérémy Fabre [Wed, 8 Feb 2017 09:07:32 +0000 (10:07 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Wed, 8 Feb 2017 09:07:26 +0000 (10:07 +0100)]
Add 3D effect on homepage. Update Gulpfile.
Emilie [Tue, 7 Feb 2017 17:21:05 +0000 (18:21 +0100)]
resolve conficts
Emilie [Tue, 7 Feb 2017 17:15:04 +0000 (18:15 +0100)]
[Home] use twitter api
Jérémy Fabre [Tue, 7 Feb 2017 17:13:02 +0000 (18:13 +0100)]
Homepage Twitter and Instagram first integration
Jérémy Fabre [Tue, 7 Feb 2017 16:57:26 +0000 (17:57 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Tue, 7 Feb 2017 16:57:17 +0000 (17:57 +0100)]
Integration of homepage slider, homepage bio, homepage body. Fix footer.
Emilie [Tue, 7 Feb 2017 15:41:32 +0000 (16:41 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Tue, 7 Feb 2017 15:41:23 +0000 (16:41 +0100)]
[Home] add twitter
Jérémy Fabre [Tue, 7 Feb 2017 14:41:46 +0000 (15:41 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Tue, 7 Feb 2017 14:40:37 +0000 (15:40 +0100)]
Homepage hero integration
Emilie [Tue, 7 Feb 2017 14:13:01 +0000 (15:13 +0100)]
[Home] add person on slider
Jérémy Fabre [Tue, 7 Feb 2017 14:02:23 +0000 (15:02 +0100)]
We can add text links to the header now
Jérémy Fabre [Tue, 7 Feb 2017 13:10:15 +0000 (14:10 +0100)]
Set global text color to white
Jérémy Fabre [Tue, 7 Feb 2017 10:50:30 +0000 (11:50 +0100)]
Footer integration
Jérémy Fabre [Tue, 7 Feb 2017 09:37:47 +0000 (10:37 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Tue, 7 Feb 2017 09:37:36 +0000 (10:37 +0100)]
First implementation of the layout and mobile navigation
Emilie [Mon, 6 Feb 2017 17:49:58 +0000 (18:49 +0100)]
Display linked orga without logo
Emilie [Mon, 6 Feb 2017 16:50:00 +0000 (17:50 +0100)]
Agenda : trying to exlclude some events by tag
Emilie [Mon, 6 Feb 2017 16:19:06 +0000 (17:19 +0100)]
is_host limite to one
Jérémy Fabre [Mon, 6 Feb 2017 09:04:00 +0000 (10:04 +0100)]
Update layout and some sass files
Jérémy Fabre [Mon, 6 Feb 2017 09:03:13 +0000 (10:03 +0100)]
Update Gulpfile with right port to use
Guillaume Pellerin [Tue, 31 Jan 2017 15:41:40 +0000 (16:41 +0100)]
Change pass and keys
Guillaume Pellerin [Tue, 31 Jan 2017 11:38:37 +0000 (12:38 +0100)]
Do not use custom agenda ATM
Guillaume Pellerin [Tue, 31 Jan 2017 11:27:30 +0000 (12:27 +0100)]
Add var submodule
Guillaume Pellerin [Tue, 31 Jan 2017 11:26:54 +0000 (12:26 +0100)]
not ignoring var
Guillaume Pellerin [Mon, 30 Jan 2017 17:44:24 +0000 (18:44 +0100)]
Ignore DBs
Guillaume Pellerin [Mon, 30 Jan 2017 17:42:53 +0000 (18:42 +0100)]
Ignore old data
Guillaume Pellerin [Thu, 26 Jan 2017 17:01:02 +0000 (18:01 +0100)]
no local grappelli-safe
Guillaume Pellerin [Thu, 26 Jan 2017 14:57:43 +0000 (15:57 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Conflicts:
docker-compose.yml
lib/mezzanine-agenda
var
Emilie Zawadzki [Thu, 26 Jan 2017 14:54:49 +0000 (15:54 +0100)]
Merge branch 'dev'
Emilie Zawadzki [Thu, 26 Jan 2017 14:54:41 +0000 (15:54 +0100)]
Dockerfile : add -y to install apt-transport-https
Emilie Zawadzki [Thu, 19 Jan 2017 20:15:00 +0000 (21:15 +0100)]
Merge branch 'dev'
Emilie Zawadzki [Thu, 19 Jan 2017 20:14:14 +0000 (21:14 +0100)]
[Timesheet] : add holidays + leave days fix
Emilie Zawadzki [Thu, 19 Jan 2017 16:03:11 +0000 (17:03 +0100)]
oMerge branch 'dev'
Emilie Zawadzki [Thu, 19 Jan 2017 16:02:15 +0000 (17:02 +0100)]
[Timesheet] : layout xls
Emilie Zawadzki [Wed, 18 Jan 2017 13:28:28 +0000 (14:28 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie Zawadzki [Wed, 18 Jan 2017 13:27:54 +0000 (14:27 +0100)]
Merge branch 'dev'
Emilie Zawadzki [Wed, 18 Jan 2017 13:26:03 +0000 (14:26 +0100)]
[Timesheet] : dashboard + style
Emilie Zawadzki [Tue, 17 Jan 2017 18:59:48 +0000 (19:59 +0100)]
[Timesheet] : export timesheet with leaved days
Emilie Zawadzki [Mon, 16 Jan 2017 16:16:56 +0000 (17:16 +0100)]
[Timesheet] : optimizing import
CRI - IRCAM [Mon, 16 Jan 2017 12:37:34 +0000 (13:37 +0100)]
Fix prod port, use build image
CRI - IRCAM [Mon, 16 Jan 2017 12:02:28 +0000 (13:02 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie Zawadzki [Mon, 16 Jan 2017 12:02:12 +0000 (13:02 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Mon, 16 Jan 2017 11:16:14 +0000 (12:16 +0100)]
Fix lib volumes in dev mode, add front building in init.sh