]>
git.parisson.com Git - mezzo.git/log
Jérémy Fabre [Fri, 30 Sep 2016 08:03:45 +0000 (10:03 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Fri, 30 Sep 2016 08:03:41 +0000 (10:03 +0200)]
Events list update
Guillaume Pellerin [Thu, 29 Sep 2016 16:35:27 +0000 (18:35 +0200)]
Add more descriptions and translations
Guillaume Pellerin [Thu, 29 Sep 2016 16:22:25 +0000 (18:22 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 29 Sep 2016 16:22:07 +0000 (18:22 +0200)]
Translate more activities
Jérémy Fabre [Thu, 29 Sep 2016 16:14:47 +0000 (18:14 +0200)]
Remove the booking button if there is no price
Jérémy Fabre [Thu, 29 Sep 2016 16:12:16 +0000 (18:12 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 29 Sep 2016 16:12:11 +0000 (18:12 +0200)]
Fix some bug on project details
Jérémy Fabre [Thu, 29 Sep 2016 16:11:55 +0000 (18:11 +0200)]
Add production notes in event details
Guillaume Pellerin [Thu, 29 Sep 2016 16:11:38 +0000 (18:11 +0200)]
Add more activity translations
Guillaume Pellerin [Thu, 29 Sep 2016 16:05:09 +0000 (18:05 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 29 Sep 2016 16:05:00 +0000 (18:05 +0200)]
Add more person admin filter
Jérémy Fabre [Thu, 29 Sep 2016 16:04:11 +0000 (18:04 +0200)]
Event date_text typo fix
Jérémy Fabre [Thu, 29 Sep 2016 16:01:56 +0000 (18:01 +0200)]
Some fixes on event details
Jérémy Fabre [Thu, 29 Sep 2016 15:40:28 +0000 (17:40 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 29 Sep 2016 15:40:19 +0000 (17:40 +0200)]
Remove tags on project details, change the sidebar
Guillaume Pellerin [Thu, 29 Sep 2016 15:25:42 +0000 (17:25 +0200)]
Add ruby install in doc
Guillaume Pellerin [Thu, 29 Sep 2016 14:56:05 +0000 (16:56 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 29 Sep 2016 14:55:56 +0000 (16:55 +0200)]
Use page sub_title in menu
Jérémy Fabre [Thu, 29 Sep 2016 14:46:09 +0000 (16:46 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 29 Sep 2016 14:45:55 +0000 (16:45 +0200)]
Change the opacity on the event line box
Guillaume Pellerin [Thu, 29 Sep 2016 14:43:42 +0000 (16:43 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 29 Sep 2016 14:43:33 +0000 (16:43 +0200)]
Fix internal link in menu
Jérémy Fabre [Thu, 29 Sep 2016 14:40:28 +0000 (16:40 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 29 Sep 2016 14:40:23 +0000 (16:40 +0200)]
Events list and details
Emilie [Thu, 29 Sep 2016 14:17:16 +0000 (16:17 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 29 Sep 2016 14:17:06 +0000 (16:17 +0200)]
Person : detail view + refacto block heritage
Jérémy Fabre [Thu, 29 Sep 2016 13:12:33 +0000 (15:12 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
# Conflicts:
# app/templates/agenda/event_list.html
Jérémy Fabre [Thu, 29 Sep 2016 13:07:23 +0000 (15:07 +0200)]
Add title and breadcrumb on event list
Emilie [Thu, 29 Sep 2016 13:00:39 +0000 (15:00 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 29 Sep 2016 13:00:29 +0000 (15:00 +0200)]
Event by month
Jérémy Fabre [Thu, 29 Sep 2016 12:29:20 +0000 (14:29 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 29 Sep 2016 12:29:15 +0000 (14:29 +0200)]
Add page tags to projects and events
Guillaume Pellerin [Thu, 29 Sep 2016 11:41:31 +0000 (13:41 +0200)]
Fix admin menu
Guillaume Pellerin [Thu, 29 Sep 2016 11:16:10 +0000 (13:16 +0200)]
Upgrade django and mezzanine
Guillaume Pellerin [Thu, 29 Sep 2016 11:12:21 +0000 (13:12 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 29 Sep 2016 11:11:18 +0000 (13:11 +0200)]
Fix EventVideo and EventAudio, rename VideoCategory to MediaCategory
Emilie [Thu, 29 Sep 2016 11:05:14 +0000 (13:05 +0200)]
Deleting useless department and team templates
Emilie [Thu, 29 Sep 2016 10:39:42 +0000 (12:39 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 29 Sep 2016 10:39:37 +0000 (12:39 +0200)]
Job : check mimetyme and max upload
Jérémy Fabre [Thu, 29 Sep 2016 10:24:11 +0000 (12:24 +0200)]
Event booking template
Jérémy Fabre [Thu, 29 Sep 2016 10:24:02 +0000 (12:24 +0200)]
Add the date_text to event details
Jérémy Fabre [Thu, 29 Sep 2016 10:14:24 +0000 (12:14 +0200)]
Job offer details first implementation
Jérémy Fabre [Thu, 29 Sep 2016 10:09:44 +0000 (12:09 +0200)]
Remove the separator before project details
Jérémy Fabre [Thu, 29 Sep 2016 10:05:18 +0000 (12:05 +0200)]
Update the project details widths
Jérémy Fabre [Thu, 29 Sep 2016 09:58:35 +0000 (11:58 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 29 Sep 2016 09:58:31 +0000 (11:58 +0200)]
Remove partners title from project details
Guillaume Pellerin [Thu, 29 Sep 2016 09:37:19 +0000 (11:37 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 29 Sep 2016 09:36:34 +0000 (11:36 +0200)]
Fix team display
Jérémy Fabre [Thu, 29 Sep 2016 09:21:06 +0000 (11:21 +0200)]
Breadcrumb small fix
Jérémy Fabre [Thu, 29 Sep 2016 09:20:47 +0000 (11:20 +0200)]
Update project details to work with topic and subtopic
Jérémy Fabre [Thu, 29 Sep 2016 08:52:01 +0000 (10:52 +0200)]
Update the sidebar on project details
Jérémy Fabre [Thu, 29 Sep 2016 08:26:15 +0000 (10:26 +0200)]
Fix the links style
Guillaume Pellerin [Thu, 29 Sep 2016 04:02:28 +0000 (06:02 +0200)]
Team short code and link in projetc page, fix double breadcrumb, bugfix
Emilie [Wed, 28 Sep 2016 17:12:45 +0000 (19:12 +0200)]
Job : add textField
Emilie [Wed, 28 Sep 2016 17:04:35 +0000 (19:04 +0200)]
Image type : altering all other objects
Emilie [Wed, 28 Sep 2016 17:01:57 +0000 (19:01 +0200)]
Project detail : delete a print
Emilie [Wed, 28 Sep 2016 16:47:04 +0000 (18:47 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Wed, 28 Sep 2016 16:46:57 +0000 (18:46 +0200)]
Menus in project page
Jérémy Fabre [Wed, 28 Sep 2016 15:50:38 +0000 (17:50 +0200)]
Add the links to events
Jérémy Fabre [Wed, 28 Sep 2016 15:00:19 +0000 (17:00 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Wed, 28 Sep 2016 15:00:15 +0000 (17:00 +0200)]
Add the download button to events
Emilie [Wed, 28 Sep 2016 13:21:15 +0000 (15:21 +0200)]
Images : create new type 'featured'
Emilie [Wed, 28 Sep 2016 13:10:02 +0000 (15:10 +0200)]
File Block : add to Person & Project | repair person list in customPage
Jérémy Fabre [Wed, 28 Sep 2016 11:42:42 +0000 (13:42 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Wed, 28 Sep 2016 11:42:30 +0000 (13:42 +0200)]
Event details first implementation
Guillaume Pellerin [Wed, 28 Sep 2016 11:00:45 +0000 (13:00 +0200)]
Fix child page display against in_menus property
Jérémy Fabre [Wed, 28 Sep 2016 09:19:20 +0000 (11:19 +0200)]
Yellow hover on role switcher
Jérémy Fabre [Wed, 28 Sep 2016 09:17:15 +0000 (11:17 +0200)]
Remove the end hour from the event date template
Jérémy Fabre [Wed, 28 Sep 2016 09:16:53 +0000 (11:16 +0200)]
Project details breadcrumb
Jérémy Fabre [Wed, 28 Sep 2016 08:38:30 +0000 (10:38 +0200)]
Add some conditions to secondary tree menu
Jérémy Fabre [Wed, 28 Sep 2016 08:38:11 +0000 (10:38 +0200)]
Fix links in page blocks
Jérémy Fabre [Wed, 28 Sep 2016 08:38:00 +0000 (10:38 +0200)]
Add the pattern, the breadcrumb topic and try the sidebar on project details
Jérémy Fabre [Tue, 27 Sep 2016 15:57:23 +0000 (17:57 +0200)]
Fix the links color in the black blocks
Jérémy Fabre [Tue, 27 Sep 2016 15:53:10 +0000 (17:53 +0200)]
Fix the EventImage in home slider
Jérémy Fabre [Tue, 27 Sep 2016 15:32:47 +0000 (17:32 +0200)]
Custom page fix for displaying childrens
Guillaume Pellerin [Tue, 27 Sep 2016 15:00:25 +0000 (17:00 +0200)]
update agenda
Guillaume Pellerin [Tue, 27 Sep 2016 14:57:00 +0000 (16:57 +0200)]
Add EventAudio and EventVideo
Guillaume Pellerin [Tue, 27 Sep 2016 14:43:28 +0000 (16:43 +0200)]
Regression on qs
Guillaume Pellerin [Tue, 27 Sep 2016 14:08:19 +0000 (16:08 +0200)]
Fix no object.images
Guillaume Pellerin [Tue, 27 Sep 2016 14:03:59 +0000 (16:03 +0200)]
Fix image inlines as list
Jérémy Fabre [Mon, 26 Sep 2016 16:30:44 +0000 (18:30 +0200)]
Remove js debug
Jérémy Fabre [Mon, 26 Sep 2016 16:30:10 +0000 (18:30 +0200)]
Menu vous êtes
Jérémy Fabre [Mon, 26 Sep 2016 15:21:20 +0000 (17:21 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Mon, 26 Sep 2016 15:20:55 +0000 (17:20 +0200)]
Hide the page card if the page is not in the menu
Jérémy Fabre [Mon, 26 Sep 2016 15:20:41 +0000 (17:20 +0200)]
Project details breadcrumb
Guillaume Pellerin [Mon, 26 Sep 2016 14:36:29 +0000 (16:36 +0200)]
Fix location room
Guillaume Pellerin [Mon, 26 Sep 2016 13:52:37 +0000 (15:52 +0200)]
Add event location room
Guillaume Pellerin [Mon, 26 Sep 2016 11:31:02 +0000 (13:31 +0200)]
Do not update translated fields each time..
Guillaume Pellerin [Mon, 26 Sep 2016 11:19:02 +0000 (13:19 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 26 Sep 2016 11:18:12 +0000 (13:18 +0200)]
Add Product lists to pages, fix admin fields order against translations
Jérémy Fabre [Mon, 26 Sep 2016 09:29:00 +0000 (11:29 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Mon, 26 Sep 2016 09:28:25 +0000 (11:28 +0200)]
Project details and topics changes
Guillaume Pellerin [Mon, 26 Sep 2016 09:26:47 +0000 (11:26 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 26 Sep 2016 09:26:31 +0000 (11:26 +0200)]
Fix project breadcrumb
Jérémy Fabre [Mon, 26 Sep 2016 09:25:37 +0000 (11:25 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Mon, 26 Sep 2016 08:44:26 +0000 (10:44 +0200)]
Add the event date specific formats
Jérémy Fabre [Mon, 26 Sep 2016 08:44:11 +0000 (10:44 +0200)]
Change the subtitle font in home slider
Guillaume Pellerin [Mon, 26 Sep 2016 08:23:09 +0000 (10:23 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 26 Sep 2016 08:22:52 +0000 (10:22 +0200)]
Add update_translation_fields command
projects / mezzo.git / log