]>
git.parisson.com Git - mezzo.git/log
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
Emilie Zawadzki [Fri, 13 Jan 2017 18:05:18 +0000 (19:05 +0100)]
[Timesheet] : export timesheet [WIP]
Emilie Zawadzki [Wed, 11 Jan 2017 16:58:34 +0000 (17:58 +0100)]
[Timesheet] : add pandas lib
Emilie Zawadzki [Wed, 11 Jan 2017 16:57:56 +0000 (17:57 +0100)]
[Timesheet] : cleaning
Emilie Zawadzki [Wed, 11 Jan 2017 16:24:20 +0000 (17:24 +0100)]
[Timesheet] : update network and project models
Emilie Zawadzki [Wed, 11 Jan 2017 16:23:07 +0000 (17:23 +0100)]
[Timesheet] : import projects > ok
Emilie Zawadzki [Wed, 11 Jan 2017 09:36:04 +0000 (10:36 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into feature/timesheets
Emilie Zawadzki [Fri, 6 Jan 2017 16:41:59 +0000 (17:41 +0100)]
[Timesheet] : project import + model updates
Emilie Zawadzki [Thu, 5 Jan 2017 18:03:05 +0000 (19:03 +0100)]
[Timesheet] : test case utils + util function to get nb of half days in worked week days
Guillaume Pellerin [Thu, 5 Jan 2017 17:16:47 +0000 (18:16 +0100)]
Fix ports
Guillaume Pellerin [Thu, 5 Jan 2017 17:13:55 +0000 (18:13 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Thu, 5 Jan 2017 17:13:46 +0000 (18:13 +0100)]
Fix no newsletter
Guillaume Pellerin [Thu, 5 Jan 2017 17:10:01 +0000 (18:10 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www
Conflicts:
.gitignore
app/bin/app.sh
Guillaume Pellerin [Thu, 5 Jan 2017 17:06:20 +0000 (18:06 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 5 Jan 2017 17:05:28 +0000 (18:05 +0100)]
Fix init, add logo_header and logo_footer image property in order to feed header and footer logos
Emilie Zawadzki [Thu, 5 Jan 2017 15:41:06 +0000 (16:41 +0100)]
[Timesheet] : add validation + accounting date
CRI - IRCAM [Thu, 5 Jan 2017 14:52:38 +0000 (15:52 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie Zawadzki [Thu, 5 Jan 2017 14:52:13 +0000 (15:52 +0100)]
Merge branch 'dev'
Emilie Zawadzki [Thu, 5 Jan 2017 14:52:02 +0000 (15:52 +0100)]
re do relative url for eve
Emilie Zawadzki [Thu, 5 Jan 2017 12:11:59 +0000 (13:11 +0100)]
[Timesheet] : import ircam time sheet : add logging
CRI - IRCAM [Thu, 5 Jan 2017 11:40:02 +0000 (12:40 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie Zawadzki [Thu, 5 Jan 2017 11:39:49 +0000 (12:39 +0100)]
Merge branch 'dev'
Emilie Zawadzki [Thu, 5 Jan 2017 11:39:41 +0000 (12:39 +0100)]
add https to eve url
CRI - IRCAM [Thu, 5 Jan 2017 11:35:37 +0000 (12:35 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie Zawadzki [Thu, 5 Jan 2017 11:35:10 +0000 (12:35 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie Zawadzki [Thu, 5 Jan 2017 11:34:52 +0000 (12:34 +0100)]
relative eve url
CRI - IRCAM [Wed, 4 Jan 2017 17:47:29 +0000 (18:47 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 4 Jan 2017 17:47:23 +0000 (18:47 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 4 Jan 2017 17:47:08 +0000 (18:47 +0100)]
Fix content
CRI - IRCAM [Wed, 4 Jan 2017 17:37:55 +0000 (18:37 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 4 Jan 2017 17:37:04 +0000 (18:37 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 4 Jan 2017 17:35:32 +0000 (18:35 +0100)]
Add ProjectBlogPage and related views with login required content
Guillaume Pellerin [Wed, 4 Jan 2017 15:50:39 +0000 (16:50 +0100)]
Re-add init script including migration and fixture import
Guillaume Pellerin [Wed, 4 Jan 2017 12:33:52 +0000 (13:33 +0100)]
Empty
CRI - IRCAM [Wed, 4 Jan 2017 12:34:29 +0000 (13:34 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
projects / mezzo.git / log