]>
git.parisson.com Git - mezzo.git/log
CRI - IRCAM [Tue, 15 Nov 2016 12:12:26 +0000 (13:12 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 15 Nov 2016 12:12:01 +0000 (13:12 +0100)]
update locales
CRI - IRCAM [Tue, 15 Nov 2016 12:09:48 +0000 (13:09 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 15 Nov 2016 12:09:26 +0000 (13:09 +0100)]
Fix aganda titles
CRI - IRCAM [Tue, 15 Nov 2016 12:04:47 +0000 (13:04 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 15 Nov 2016 12:04:15 +0000 (13:04 +0100)]
update locales
Guillaume Pellerin [Tue, 15 Nov 2016 11:57:35 +0000 (12:57 +0100)]
Merge remote-tracking branch 'gitlab/patch-13'
CRI - IRCAM [Tue, 15 Nov 2016 11:46:26 +0000 (12:46 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 15 Nov 2016 11:46:14 +0000 (12:46 +0100)]
Bugfix
CRI - IRCAM [Tue, 15 Nov 2016 10:28:37 +0000 (11:28 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 15 Nov 2016 10:28:27 +0000 (11:28 +0100)]
Fix links slug
CRI - IRCAM [Tue, 15 Nov 2016 10:26:27 +0000 (11:26 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 15 Nov 2016 10:26:20 +0000 (11:26 +0100)]
Fix fa option
CRI - IRCAM [Tue, 15 Nov 2016 10:25:19 +0000 (11:25 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 15 Nov 2016 10:25:08 +0000 (11:25 +0100)]
Fix icons
CRI - IRCAM [Tue, 15 Nov 2016 10:19:43 +0000 (11:19 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 15 Nov 2016 10:19:02 +0000 (11:19 +0100)]
Use status description for plural
Guillaume Pellerin [Mon, 14 Nov 2016 17:50:02 +0000 (18:50 +0100)]
Add link options, more includes simplifying base.html, add host_organization in context
CRI - IRCAM [Mon, 14 Nov 2016 14:51:39 +0000 (15:51 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Mon, 14 Nov 2016 14:51:08 +0000 (15:51 +0100)]
Person email when activity and team only
CRI - IRCAM [Mon, 14 Nov 2016 14:46:41 +0000 (15:46 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Mon, 14 Nov 2016 14:46:12 +0000 (15:46 +0100)]
Fix person email display (fix #395)
CRI - IRCAM [Mon, 14 Nov 2016 14:36:29 +0000 (15:36 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Mon, 14 Nov 2016 14:35:53 +0000 (15:35 +0100)]
Regroup persons by parent status
CRI - IRCAM [Mon, 14 Nov 2016 14:24:55 +0000 (15:24 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Mon, 14 Nov 2016 14:24:29 +0000 (15:24 +0100)]
Status with parent only
CRI - IRCAM [Mon, 14 Nov 2016 13:33:28 +0000 (14:33 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Mon, 14 Nov 2016 13:33:12 +0000 (14:33 +0100)]
Change default email
CRI - IRCAM [Sun, 13 Nov 2016 22:13:59 +0000 (23:13 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Sun, 13 Nov 2016 22:13:40 +0000 (23:13 +0100)]
Add menu entry
CRI - IRCAM [Sun, 13 Nov 2016 22:12:44 +0000 (23:12 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Sun, 13 Nov 2016 22:12:27 +0000 (23:12 +0100)]
Add admin table
CRI - IRCAM [Sun, 13 Nov 2016 22:10:26 +0000 (23:10 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Sun, 13 Nov 2016 22:10:03 +0000 (23:10 +0100)]
Add translations
CRI - IRCAM [Sun, 13 Nov 2016 21:48:37 +0000 (22:48 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Sun, 13 Nov 2016 21:43:20 +0000 (22:43 +0100)]
Add additional organization data, simplify verbose names
CRI - IRCAM [Sat, 12 Nov 2016 00:51:17 +0000 (01:51 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Sat, 12 Nov 2016 00:50:11 +0000 (01:50 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 10 Nov 2016 15:12:55 +0000 (16:12 +0100)]
Update favicon meta tag
Jérémy Fabre [Thu, 10 Nov 2016 15:09:50 +0000 (16:09 +0100)]
Add LightGallery to sliders
Jérémy Fabre [Thu, 10 Nov 2016 14:57:36 +0000 (15:57 +0100)]
Increase pause time of home slider
CRI - IRCAM [Thu, 10 Nov 2016 13:57:51 +0000 (14:57 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Thu, 10 Nov 2016 13:56:53 +0000 (14:56 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 10 Nov 2016 13:54:14 +0000 (14:54 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 10 Nov 2016 13:54:10 +0000 (14:54 +0100)]
Update the home slider, add auto play
Guillaume Pellerin [Thu, 10 Nov 2016 12:49:28 +0000 (13:49 +0100)]
Update locales
CRI - IRCAM [Thu, 10 Nov 2016 12:11:00 +0000 (13:11 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Thu, 10 Nov 2016 12:10:39 +0000 (13:10 +0100)]
Fix #391 ULYSSES
CRI - IRCAM [Thu, 10 Nov 2016 12:03:23 +0000 (13:03 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Thu, 10 Nov 2016 12:02:03 +0000 (13:02 +0100)]
Fix type
Guillaume Pellerin [Thu, 10 Nov 2016 12:01:03 +0000 (13:01 +0100)]
Fix no menu_id
CRI - IRCAM [Thu, 10 Nov 2016 09:19:10 +0000 (10:19 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Thu, 10 Nov 2016 09:18:44 +0000 (10:18 +0100)]
Fix #391
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
projects / mezzo.git / log