]>
git.parisson.com Git - mezzo.git/log
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)
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
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
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
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
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
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
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
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
Guillaume Pellerin [Tue, 8 Nov 2016 10:32:17 +0000 (11:32 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 8 Nov 2016 10:32:10 +0000 (11:32 +0100)]
update locales
Jérémy Fabre [Tue, 8 Nov 2016 10:32:08 +0000 (11:32 +0100)]
Fix current tree primary
Guillaume Pellerin [Tue, 8 Nov 2016 10:29:09 +0000 (11:29 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 8 Nov 2016 10:28:59 +0000 (11:28 +0100)]
update locales
Guillaume Pellerin [Tue, 8 Nov 2016 10:28:36 +0000 (11:28 +0100)]
Merge branch 'dev' of gitlab.com:yomguy/ircam-www into dev
Conflicts:
app/locale/fr/LC_MESSAGES/django.po
Guillaume Pellerin [Tue, 8 Nov 2016 10:26:15 +0000 (11:26 +0100)]
Fix some locales
Guillaume Pellerin [Tue, 8 Nov 2016 10:19:45 +0000 (11:19 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 8 Nov 2016 10:19:39 +0000 (11:19 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 8 Nov 2016 10:19:24 +0000 (11:19 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Tue, 8 Nov 2016 10:19:13 +0000 (11:19 +0100)]
Update team person list place
Emilie [Tue, 8 Nov 2016 10:13:47 +0000 (11:13 +0100)]
Merge branch 'dev'
Emilie [Tue, 8 Nov 2016 10:04:45 +0000 (11:04 +0100)]
Footer : commenting newsletter
Emilie [Tue, 8 Nov 2016 10:03:10 +0000 (11:03 +0100)]
Footer : comment menu
Guillaume Pellerin [Tue, 8 Nov 2016 09:48:05 +0000 (10:48 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 8 Nov 2016 09:47:56 +0000 (10:47 +0100)]
Bugfix
Guillaume Pellerin [Tue, 8 Nov 2016 09:44:40 +0000 (10:44 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 8 Nov 2016 09:44:18 +0000 (10:44 +0100)]
Pin django-querysetsequence==0.6.1 in app.sh
Guillaume Pellerin [Tue, 8 Nov 2016 09:37:11 +0000 (10:37 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 8 Nov 2016 09:36:55 +0000 (10:36 +0100)]
Pin python module versions
Guillaume Pellerin [Tue, 8 Nov 2016 09:27:25 +0000 (10:27 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Tue, 8 Nov 2016 09:27:13 +0000 (10:27 +0100)]
No pqsql log
Emilie [Mon, 7 Nov 2016 19:39:28 +0000 (20:39 +0100)]
Demo : add br
Guillaume Pellerin [Mon, 7 Nov 2016 19:32:50 +0000 (20:32 +0100)]
test
Guillaume Pellerin [Mon, 7 Nov 2016 19:32:16 +0000 (20:32 +0100)]
test
Guillaume Pellerin [Mon, 7 Nov 2016 19:31:22 +0000 (20:31 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Mon, 7 Nov 2016 19:31:01 +0000 (20:31 +0100)]
Test re-enable cache
Guillaume Pellerin [Mon, 7 Nov 2016 19:29:03 +0000 (20:29 +0100)]
Disable template cache for the moment
Emilie [Mon, 7 Nov 2016 19:25:55 +0000 (20:25 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Mon, 7 Nov 2016 19:25:46 +0000 (20:25 +0100)]
Person : add data in detail view
Guillaume Pellerin [Mon, 7 Nov 2016 19:15:26 +0000 (20:15 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Mon, 7 Nov 2016 19:15:12 +0000 (20:15 +0100)]
Add demo metadata
Guillaume Pellerin [Mon, 7 Nov 2016 18:53:25 +0000 (19:53 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Mon, 7 Nov 2016 18:53:15 +0000 (19:53 +0100)]
Add admins
Guillaume Pellerin [Mon, 7 Nov 2016 18:14:42 +0000 (19:14 +0100)]
Merge branch 'dev'
Conflicts:
app/settings.py
Guillaume Pellerin [Mon, 7 Nov 2016 18:10:43 +0000 (19:10 +0100)]
Add yellow bg to team, fix tinymce in dev mode
Guillaume Pellerin [Mon, 7 Nov 2016 17:50:20 +0000 (18:50 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 7 Nov 2016 17:49:53 +0000 (18:49 +0100)]
Add Demo URL, fix person list placeholder
Emilie [Mon, 7 Nov 2016 17:24:43 +0000 (18:24 +0100)]
Event : sitching domain for eve
Emilie [Mon, 7 Nov 2016 17:18:57 +0000 (17:18 +0000)]
Merge branch 'patch-12' into 'dev'
Update django.po
See merge request !10
Emilie [Mon, 7 Nov 2016 17:10:11 +0000 (18:10 +0100)]
Menu with no children
Emilie [Mon, 7 Nov 2016 16:44:31 +0000 (17:44 +0100)]
Deleting useless print
Emilie [Mon, 7 Nov 2016 16:33:50 +0000 (17:33 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Mon, 7 Nov 2016 16:33:12 +0000 (17:33 +0100)]
Newsletter : url link
Guillaume Pellerin [Mon, 7 Nov 2016 16:30:00 +0000 (17:30 +0100)]
Fix DEBUG management, move team person block
Guillaume Pellerin [Mon, 7 Nov 2016 16:06:15 +0000 (17:06 +0100)]
Fix tinymce url
Guillaume Pellerin [Mon, 7 Nov 2016 15:56:12 +0000 (16:56 +0100)]
Add DEBUG filter for analytics
projects / mezzo.git / log