]>
git.parisson.com Git - mezzo.git/log
CRI - IRCAM [Tue, 8 Nov 2016 10:29:18 +0000 (11:29 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
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
CRI - IRCAM [Tue, 8 Nov 2016 10:19:58 +0000 (11:19 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
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
CRI - IRCAM [Tue, 8 Nov 2016 10:17:43 +0000 (11:17 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
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
CRI - IRCAM [Tue, 8 Nov 2016 09:48:13 +0000 (10:48 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
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
CRI - IRCAM [Tue, 8 Nov 2016 09:44:45 +0000 (10:44 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
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
CRI - IRCAM [Tue, 8 Nov 2016 09:37:24 +0000 (10:37 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
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
CRI - IRCAM [Mon, 7 Nov 2016 19:33:00 +0000 (20:33 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Mon, 7 Nov 2016 19:32:50 +0000 (20:32 +0100)]
test
CRI - IRCAM [Mon, 7 Nov 2016 19:32:21 +0000 (20:32 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Mon, 7 Nov 2016 19:32:16 +0000 (20:32 +0100)]
test
CRI - IRCAM [Mon, 7 Nov 2016 19:31:27 +0000 (20:31 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
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
CRI - IRCAM [Mon, 7 Nov 2016 19:29:29 +0000 (20:29 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
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
CRI - IRCAM [Mon, 7 Nov 2016 19:15:32 +0000 (20:15 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
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
CRI - IRCAM [Mon, 7 Nov 2016 18:53:39 +0000 (19:53 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
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
CRI - IRCAM [Mon, 7 Nov 2016 18:25:55 +0000 (19:25 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
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
Guillaume Pellerin [Mon, 7 Nov 2016 15:40:35 +0000 (16:40 +0100)]
Merge branch 'dev'
Conflicts:
app/settings.py
Guillaume Pellerin [Mon, 7 Nov 2016 15:36:14 +0000 (16:36 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 7 Nov 2016 15:35:43 +0000 (16:35 +0100)]
Fix DEBUG parsing
Emilie [Mon, 7 Nov 2016 15:31:28 +0000 (16:31 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Mon, 7 Nov 2016 15:31:22 +0000 (16:31 +0100)]
Event : add price description
Guillaume Pellerin [Mon, 7 Nov 2016 15:21:29 +0000 (16:21 +0100)]
Add uwsgi log
Emilie [Mon, 7 Nov 2016 14:48:49 +0000 (15:48 +0100)]
Person : add translation
Guillaume Pellerin [Mon, 7 Nov 2016 14:37:21 +0000 (15:37 +0100)]
Fix team block name
Guillaume Pellerin [Mon, 7 Nov 2016 14:26:27 +0000 (15:26 +0100)]
Fix person save
Guillaume Pellerin [Mon, 7 Nov 2016 14:04:58 +0000 (15:04 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 7 Nov 2016 14:04:20 +0000 (15:04 +0100)]
Status diplayed by default, published projects only
Jérémy Fabre [Mon, 7 Nov 2016 12:06:12 +0000 (13:06 +0100)]
Add the participants list to teampage
Jérémy Fabre [Mon, 7 Nov 2016 11:52:44 +0000 (12:52 +0100)]
Fix media shutter
Jérémy Fabre [Mon, 7 Nov 2016 11:35:30 +0000 (12:35 +0100)]
Re-fix the event list tree menu
Jérémy Fabre [Mon, 7 Nov 2016 11:23:48 +0000 (12:23 +0100)]
Try to fix the event tree menu
Emilie [Mon, 7 Nov 2016 11:15:40 +0000 (12:15 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Mon, 7 Nov 2016 11:15:33 +0000 (12:15 +0100)]
Media: correcting link on playlist shutter
Jérémy Fabre [Mon, 7 Nov 2016 11:09:35 +0000 (12:09 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Mon, 7 Nov 2016 11:09:21 +0000 (12:09 +0100)]
Fix the pagination on media list
Emilie [Mon, 7 Nov 2016 11:03:07 +0000 (12:03 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Mon, 7 Nov 2016 11:03:00 +0000 (12:03 +0100)]
Page: add custom and team card
Jérémy Fabre [Mon, 7 Nov 2016 11:02:51 +0000 (12:02 +0100)]
Home media shutter fix
Guillaume Pellerin [Mon, 7 Nov 2016 11:02:26 +0000 (12:02 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 7 Nov 2016 11:02:07 +0000 (12:02 +0100)]
Better activity filtering, fix article slug
Emilie [Mon, 7 Nov 2016 10:47:02 +0000 (11:47 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Mon, 7 Nov 2016 10:46:56 +0000 (11:46 +0100)]
Media : add pagination on list page
Jérémy Fabre [Mon, 7 Nov 2016 10:45:53 +0000 (11:45 +0100)]
Event list menu sticky fix
Jérémy Fabre [Mon, 7 Nov 2016 10:44:05 +0000 (11:44 +0100)]
Fix indentation
Jérémy Fabre [Mon, 7 Nov 2016 10:43:58 +0000 (11:43 +0100)]
Update event list template with tree menu and summary
Guillaume Pellerin [Mon, 7 Nov 2016 09:46:52 +0000 (10:46 +0100)]
Add order and display activity metadata, add demo detail view
Guillaume Pellerin [Mon, 7 Nov 2016 09:45:32 +0000 (10:45 +0100)]
Add activity filters, filter published articles (fix #344), goto django 1.9.11
Guillaume Pellerin [Sun, 6 Nov 2016 19:51:21 +0000 (20:51 +0100)]
Add first demo detail view, update admin filters
Guillaume Pellerin [Fri, 4 Nov 2016 21:40:09 +0000 (22:40 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 4 Nov 2016 17:58:32 +0000 (18:58 +0100)]
Project : add dynamic content
Delacour [Fri, 4 Nov 2016 17:48:13 +0000 (17:48 +0000)]
Update django.po
Emilie [Fri, 4 Nov 2016 17:26:04 +0000 (18:26 +0100)]
Event: restrict models
Emilie [Fri, 4 Nov 2016 17:24:28 +0000 (18:24 +0100)]
Event : add related content
Emilie [Fri, 4 Nov 2016 16:42:21 +0000 (17:42 +0100)]
TeamPage : add related content
Emilie [Fri, 4 Nov 2016 16:28:39 +0000 (17:28 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 4 Nov 2016 16:28:31 +0000 (17:28 +0100)]
Article : reverse related content
Jérémy Fabre [Fri, 4 Nov 2016 15:57:01 +0000 (16:57 +0100)]
Fix the dashed style
Guillaume Pellerin [Fri, 4 Nov 2016 15:30:25 +0000 (16:30 +0100)]
Update admin filters
Guillaume Pellerin [Fri, 4 Nov 2016 15:13:15 +0000 (16:13 +0100)]
Finally fix various M2M values and related import rules, minor network.models update
projects / mezzo.git / log