]>
git.parisson.com Git - mezzo.git/log
CRI - IRCAM [Thu, 10 Nov 2016 09:16:07 +0000 (10:16 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Thu, 10 Nov 2016 09:15:21 +0000 (10:15 +0100)]
Fix event list display
CRI - IRCAM [Wed, 9 Nov 2016 15:41:14 +0000 (16:41 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 9 Nov 2016 15:40:53 +0000 (16:40 +0100)]
Add spam filter
CRI - IRCAM [Wed, 9 Nov 2016 15:39:00 +0000 (16:39 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 9 Nov 2016 15:38:43 +0000 (16:38 +0100)]
Fix email
CRI - IRCAM [Wed, 9 Nov 2016 15:34:13 +0000 (16:34 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 9 Nov 2016 15:33:52 +0000 (16:33 +0100)]
Fix #375
CRI - IRCAM [Wed, 9 Nov 2016 15:30:16 +0000 (16:30 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 9 Nov 2016 15:30:12 +0000 (16:30 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 9 Nov 2016 15:29:59 +0000 (16:29 +0100)]
Update demo style
CRI - IRCAM [Wed, 9 Nov 2016 15:18:51 +0000 (16:18 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 9 Nov 2016 15:18:46 +0000 (16:18 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 9 Nov 2016 15:18:04 +0000 (16:18 +0100)]
Fix person detail data (fix #383)
CRI - IRCAM [Wed, 9 Nov 2016 14:33:18 +0000 (15:33 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 9 Nov 2016 14:33:13 +0000 (15:33 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 9 Nov 2016 14:32:43 +0000 (15:32 +0100)]
bugfix
CRI - IRCAM [Wed, 9 Nov 2016 14:29:27 +0000 (15:29 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 9 Nov 2016 14:29:17 +0000 (15:29 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 9 Nov 2016 14:29:07 +0000 (15:29 +0100)]
update locales
Guillaume Pellerin [Wed, 9 Nov 2016 12:53:23 +0000 (13:53 +0100)]
Add gulp build on pull.sh
CRI - IRCAM [Wed, 9 Nov 2016 12:00:35 +0000 (13:00 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 9 Nov 2016 12:00:27 +0000 (13:00 +0100)]
Merge branch 'dev'
Conflicts:
app/settings.py
Guillaume Pellerin [Wed, 9 Nov 2016 11:58:32 +0000 (12:58 +0100)]
Better DEBUG management (espacially for cache loaders)
CRI - IRCAM [Wed, 9 Nov 2016 11:36:58 +0000 (12:36 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 9 Nov 2016 11:36:51 +0000 (12:36 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 9 Nov 2016 11:36:37 +0000 (12:36 +0100)]
Bugfix
CRI - IRCAM [Wed, 9 Nov 2016 11:34:51 +0000 (12:34 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 9 Nov 2016 11:34:43 +0000 (12:34 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 9 Nov 2016 11:29:06 +0000 (12:29 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Wed, 9 Nov 2016 11:28:18 +0000 (12:28 +0100)]
Add team links, add organization.is_host (main org)
Jérémy Fabre [Wed, 9 Nov 2016 08:50:50 +0000 (09:50 +0100)]
Fix the header menu on tablet devices
Jérémy Fabre [Wed, 9 Nov 2016 08:44:20 +0000 (09:44 +0100)]
Add some margin to nav header sub links
Jérémy Fabre [Wed, 9 Nov 2016 08:22:31 +0000 (09:22 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Wed, 9 Nov 2016 08:22:27 +0000 (09:22 +0100)]
Update copyright in footer
Jérémy Fabre [Wed, 9 Nov 2016 08:10:56 +0000 (09:10 +0100)]
Add favicon
Emilie [Tue, 8 Nov 2016 17:48:30 +0000 (18:48 +0100)]
giMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Tue, 8 Nov 2016 17:48:21 +0000 (18:48 +0100)]
Blog : deleting useless templates
CRI - IRCAM [Tue, 8 Nov 2016 17:23:52 +0000 (18:23 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 8 Nov 2016 17:23:44 +0000 (18:23 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 8 Nov 2016 17:23:27 +0000 (18:23 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Tue, 8 Nov 2016 17:23:17 +0000 (18:23 +0100)]
Add trans
Jérémy Fabre [Tue, 8 Nov 2016 17:06:21 +0000 (18:06 +0100)]
Fix newsletter alignments
Jérémy Fabre [Tue, 8 Nov 2016 16:53:27 +0000 (17:53 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Tue, 8 Nov 2016 16:53:23 +0000 (17:53 +0100)]
Fix a service banner bug
Guillaume Pellerin [Tue, 8 Nov 2016 16:39:54 +0000 (17:39 +0100)]
Add Copyright (partially fix #372)
CRI - IRCAM [Tue, 8 Nov 2016 16:30:24 +0000 (17:30 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 8 Nov 2016 16:30:18 +0000 (17:30 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
CRI - IRCAM [Tue, 8 Nov 2016 16:29:51 +0000 (17:29 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 8 Nov 2016 16:29:22 +0000 (17:29 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 8 Nov 2016 16:29:12 +0000 (17:29 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Tue, 8 Nov 2016 16:29:03 +0000 (17:29 +0100)]
update locales
Emilie [Tue, 8 Nov 2016 16:26:31 +0000 (17:26 +0100)]
Merge branch 'dev'
Emilie [Tue, 8 Nov 2016 16:26:13 +0000 (17:26 +0100)]
Newsletter: url test
CRI - IRCAM [Tue, 8 Nov 2016 15:46:04 +0000 (16:46 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie [Tue, 8 Nov 2016 15:45:04 +0000 (16:45 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie [Tue, 8 Nov 2016 15:44:39 +0000 (16:44 +0100)]
Merge branch 'dev'
Emilie [Tue, 8 Nov 2016 15:41:15 +0000 (16:41 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Tue, 8 Nov 2016 15:40:56 +0000 (16:40 +0100)]
Translations
CRI - IRCAM [Tue, 8 Nov 2016 15:21:55 +0000 (16:21 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 8 Nov 2016 15:21:44 +0000 (16:21 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 8 Nov 2016 15:21:33 +0000 (16:21 +0100)]
Bugfix
CRI - IRCAM [Tue, 8 Nov 2016 15:15:55 +0000 (16:15 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 8 Nov 2016 15:15:45 +0000 (16:15 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 8 Nov 2016 15:15:00 +0000 (16:15 +0100)]
Add status.display_text, comment person status and functions (for the moment)
Guillaume Pellerin [Tue, 8 Nov 2016 14:46:59 +0000 (15:46 +0100)]
Person data style
Guillaume Pellerin [Tue, 8 Nov 2016 14:43:32 +0000 (15:43 +0100)]
Add <strong> to email
CRI - IRCAM [Tue, 8 Nov 2016 14:41:50 +0000 (15:41 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 8 Nov 2016 14:41:38 +0000 (15:41 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 8 Nov 2016 14:41:33 +0000 (15:41 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 8 Nov 2016 14:41:22 +0000 (15:41 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Conflicts:
app/templates/network/person_detail.html
Guillaume Pellerin [Tue, 8 Nov 2016 14:38:23 +0000 (15:38 +0100)]
Update person detail data, update index link
Emilie [Tue, 8 Nov 2016 14:38:02 +0000 (15:38 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie [Tue, 8 Nov 2016 14:37:57 +0000 (15:37 +0100)]
Merge branch 'dev'
Emilie [Tue, 8 Nov 2016 14:37:40 +0000 (15:37 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Tue, 8 Nov 2016 14:37:33 +0000 (15:37 +0100)]
Product : external link in search
Jérémy Fabre [Tue, 8 Nov 2016 14:21:39 +0000 (15:21 +0100)]
Hover on media boxes
Jérémy Fabre [Tue, 8 Nov 2016 14:14:02 +0000 (15:14 +0100)]
Add publish date label to article detail template
Jérémy Fabre [Tue, 8 Nov 2016 14:07:25 +0000 (15:07 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Tue, 8 Nov 2016 14:07:11 +0000 (15:07 +0100)]
Person details implementation
Emilie [Tue, 8 Nov 2016 14:07:08 +0000 (15:07 +0100)]
app.sh: disable migration, do it manually now on local server
Jérémy Fabre [Tue, 8 Nov 2016 13:52:19 +0000 (14:52 +0100)]
Add newsletter subscribe button to footer
Jérémy Fabre [Tue, 8 Nov 2016 13:41:23 +0000 (14:41 +0100)]
Errors 400 and 500 templates
Jérémy Fabre [Tue, 8 Nov 2016 13:41:13 +0000 (14:41 +0100)]
Add a separator on homepage on mobile devices
CRI - IRCAM [Tue, 8 Nov 2016 13:39:06 +0000 (14:39 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 8 Nov 2016 13:38:46 +0000 (14:38 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 8 Nov 2016 13:38:30 +0000 (14:38 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Tue, 8 Nov 2016 13:38:11 +0000 (14:38 +0100)]
no @ in emails
Jérémy Fabre [Tue, 8 Nov 2016 11:03:42 +0000 (12:03 +0100)]
Fix brief boxes height
Jérémy Fabre [Tue, 8 Nov 2016 10:59:25 +0000 (11:59 +0100)]
Smooth scroll on summary links
Jérémy Fabre [Tue, 8 Nov 2016 10:53:08 +0000 (11:53 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Tue, 8 Nov 2016 10:52:57 +0000 (11:52 +0100)]
Add the media description to the video and audio playlists
CRI - IRCAM [Tue, 8 Nov 2016 10:49:52 +0000 (11:49 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 8 Nov 2016 10:49:43 +0000 (11:49 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 8 Nov 2016 10:49:34 +0000 (11:49 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Tue, 8 Nov 2016 10:49:23 +0000 (11:49 +0100)]
Add project demo links
Jérémy Fabre [Tue, 8 Nov 2016 10:46:33 +0000 (11:46 +0100)]
Remove publication date from article cards
Jérémy Fabre [Tue, 8 Nov 2016 10:34:37 +0000 (11:34 +0100)]
Change the "back" title of nav tree
Jérémy Fabre [Tue, 8 Nov 2016 10:33:12 +0000 (11:33 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Tue, 8 Nov 2016 10:33:07 +0000 (11:33 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
# Conflicts:
# app/templates/pages/menus/current_tree_primary.html
projects / mezzo.git / log