]>
git.parisson.com Git - mezzo.git/log
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
Jérémy Fabre [Mon, 26 Sep 2016 08:05:51 +0000 (10:05 +0200)]
Remove hidden pages from summary menu
Emilie [Sat, 24 Sep 2016 09:46:50 +0000 (11:46 +0200)]
Article : deleted related_article, replaced by dynamic content | fix article_card in DepartmentPage
Emilie [Sat, 24 Sep 2016 09:09:25 +0000 (11:09 +0200)]
Brief: translating title + content
Emilie [Fri, 23 Sep 2016 16:53:10 +0000 (18:53 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 23 Sep 2016 16:53:02 +0000 (18:53 +0200)]
Article [WIP]: add related Article and Event | generalizing card template
Guillaume Pellerin [Fri, 23 Sep 2016 16:20:48 +0000 (18:20 +0200)]
Fix product admin, no variation use
Guillaume Pellerin [Fri, 23 Sep 2016 16:12:06 +0000 (18:12 +0200)]
Add product link inlines
Guillaume Pellerin [Fri, 23 Sep 2016 16:01:50 +0000 (18:01 +0200)]
Add lead organization
Guillaume Pellerin [Fri, 23 Sep 2016 15:52:35 +0000 (17:52 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 23 Sep 2016 15:52:10 +0000 (17:52 +0200)]
Article: add Person List Block
Guillaume Pellerin [Fri, 23 Sep 2016 15:52:08 +0000 (17:52 +0200)]
Product block for all pages
Guillaume Pellerin [Fri, 23 Sep 2016 15:41:20 +0000 (17:41 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Fri, 23 Sep 2016 15:40:59 +0000 (17:40 +0200)]
Create ProductBlock and related page inline
Emilie [Fri, 23 Sep 2016 15:12:34 +0000 (17:12 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 23 Sep 2016 15:12:27 +0000 (17:12 +0200)]
Department menu : we can add link page
Guillaume Pellerin [Fri, 23 Sep 2016 15:11:46 +0000 (17:11 +0200)]
Init shop templates, cleanup
Guillaume Pellerin [Fri, 23 Sep 2016 14:38:57 +0000 (16:38 +0200)]
Update translations
Guillaume Pellerin [Fri, 23 Sep 2016 14:36:01 +0000 (16:36 +0200)]
Add event person and link inlines
Guillaume Pellerin [Fri, 23 Sep 2016 14:18:53 +0000 (16:18 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Fri, 23 Sep 2016 14:18:12 +0000 (16:18 +0200)]
Translate keywords, add first prestashop to event command
Jérémy Fabre [Fri, 23 Sep 2016 13:41:33 +0000 (15:41 +0200)]
Minimize the font size in the links
Jérémy Fabre [Fri, 23 Sep 2016 13:41:18 +0000 (15:41 +0200)]
Change the buttons color in the person block
Jérémy Fabre [Fri, 23 Sep 2016 13:34:56 +0000 (15:34 +0200)]
Remove another bug
Jérémy Fabre [Fri, 23 Sep 2016 13:33:25 +0000 (15:33 +0200)]
Light font in the page content.
Jérémy Fabre [Fri, 23 Sep 2016 13:33:05 +0000 (15:33 +0200)]
Remove a bug
Jérémy Fabre [Fri, 23 Sep 2016 12:46:20 +0000 (14:46 +0200)]
Fix links hover in yellow block
Jérémy Fabre [Fri, 23 Sep 2016 12:46:01 +0000 (14:46 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Fri, 23 Sep 2016 12:45:54 +0000 (14:45 +0200)]
Fix the summary menu
Jérémy Fabre [Fri, 23 Sep 2016 12:45:43 +0000 (14:45 +0200)]
Add the title to the summary
Jérémy Fabre [Fri, 23 Sep 2016 12:44:34 +0000 (14:44 +0200)]
Remove truncate on block person
Jérémy Fabre [Fri, 23 Sep 2016 12:44:19 +0000 (14:44 +0200)]
Margin on H2 + P
Guillaume Pellerin [Fri, 23 Sep 2016 11:42:34 +0000 (13:42 +0200)]
Regression on submodule update
Guillaume Pellerin [Fri, 23 Sep 2016 10:53:45 +0000 (12:53 +0200)]
Fix topic name
Guillaume Pellerin [Fri, 23 Sep 2016 10:53:01 +0000 (12:53 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Fri, 23 Sep 2016 10:52:41 +0000 (12:52 +0200)]
Prepare shop, renamle Category
Emilie [Fri, 23 Sep 2016 10:46:35 +0000 (12:46 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 23 Sep 2016 10:46:30 +0000 (12:46 +0200)]
Menu 'Vous êtes'
Jérémy Fabre [Fri, 23 Sep 2016 10:28:20 +0000 (12:28 +0200)]
Fix the links style in yellow blocks
Jérémy Fabre [Fri, 23 Sep 2016 10:05:12 +0000 (12:05 +0200)]
Add the department to event generic card and slider templates
Jérémy Fabre [Fri, 23 Sep 2016 09:57:00 +0000 (11:57 +0200)]
Home events in body and slider
Jérémy Fabre [Fri, 23 Sep 2016 09:45:25 +0000 (11:45 +0200)]
Woops commit
Jérémy Fabre [Fri, 23 Sep 2016 09:41:18 +0000 (11:41 +0200)]
Fix lists
Jérémy Fabre [Fri, 23 Sep 2016 09:39:46 +0000 (11:39 +0200)]
Add the videos slider to projects
Jérémy Fabre [Fri, 23 Sep 2016 09:34:23 +0000 (11:34 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Fri, 23 Sep 2016 09:34:16 +0000 (11:34 +0200)]
First implementation of project topic details
Emilie [Fri, 23 Sep 2016 09:33:40 +0000 (11:33 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 23 Sep 2016 09:33:32 +0000 (11:33 +0200)]
Home : Add events
Guillaume Pellerin [Fri, 23 Sep 2016 09:18:50 +0000 (11:18 +0200)]
Add project links, fix no project dates
Guillaume Pellerin [Fri, 23 Sep 2016 09:12:51 +0000 (11:12 +0200)]
Fix project topic list
Guillaume Pellerin [Fri, 23 Sep 2016 08:38:51 +0000 (10:38 +0200)]
Fix data pull, ad sub_topic filter
Emilie [Fri, 23 Sep 2016 08:29:28 +0000 (10:29 +0200)]
Person list: invert lastname and firstname
Jérémy Fabre [Fri, 23 Sep 2016 08:21:34 +0000 (10:21 +0200)]
Re-fix the links in ul
Jérémy Fabre [Fri, 23 Sep 2016 08:12:41 +0000 (10:12 +0200)]
Add links to Department, Team and Project pages
Jérémy Fabre [Fri, 23 Sep 2016 08:12:24 +0000 (10:12 +0200)]
Fix the links in ul
Jérémy Fabre [Fri, 23 Sep 2016 08:00:30 +0000 (10:00 +0200)]
Linked websites with LinkType
Jérémy Fabre [Thu, 22 Sep 2016 16:14:45 +0000 (18:14 +0200)]
Remove debug on audio player
Jérémy Fabre [Thu, 22 Sep 2016 16:13:47 +0000 (18:13 +0200)]
Add optional breadcrumb on project page
Jérémy Fabre [Thu, 22 Sep 2016 16:13:37 +0000 (18:13 +0200)]
Fix logos
Jérémy Fabre [Thu, 22 Sep 2016 15:54:44 +0000 (17:54 +0200)]
Add some margins to project details, add the breadcrumb
Jérémy Fabre [Thu, 22 Sep 2016 15:49:00 +0000 (17:49 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
# Conflicts:
# app/templates/projects/project_detail.html
Jérémy Fabre [Thu, 22 Sep 2016 15:47:00 +0000 (17:47 +0200)]
Fix the logos, and add the project details implementation
Guillaume Pellerin [Thu, 22 Sep 2016 15:32:54 +0000 (17:32 +0200)]
Add block title
Guillaume Pellerin [Thu, 22 Sep 2016 15:26:21 +0000 (17:26 +0200)]
Add department to ProjectDetailView context
Guillaume Pellerin [Thu, 22 Sep 2016 14:48:29 +0000 (16:48 +0200)]
Fix topic list display
Guillaume Pellerin [Thu, 22 Sep 2016 14:43:58 +0000 (16:43 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 22 Sep 2016 14:43:40 +0000 (16:43 +0200)]
Add ProjectTopicPage template
Guillaume Pellerin [Thu, 22 Sep 2016 14:43:08 +0000 (16:43 +0200)]
Add ProjectTopicPage
Jérémy Fabre [Thu, 22 Sep 2016 14:37:26 +0000 (16:37 +0200)]
Pause all audio if we play one
Jérémy Fabre [Thu, 22 Sep 2016 14:28:47 +0000 (16:28 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 22 Sep 2016 14:28:41 +0000 (16:28 +0200)]
New audio player
Guillaume Pellerin [Thu, 22 Sep 2016 13:50:55 +0000 (15:50 +0200)]
Fix br
Guillaume Pellerin [Thu, 22 Sep 2016 13:49:59 +0000 (15:49 +0200)]
Fix various blocks
Guillaume Pellerin [Thu, 22 Sep 2016 13:44:19 +0000 (15:44 +0200)]
Fix project detail block
Guillaume Pellerin [Thu, 22 Sep 2016 13:43:16 +0000 (15:43 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 22 Sep 2016 13:43:08 +0000 (15:43 +0200)]
Fix logos
Jérémy Fabre [Thu, 22 Sep 2016 13:42:03 +0000 (15:42 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 22 Sep 2016 13:41:42 +0000 (15:41 +0200)]
Fix the home banners on homepage
Jérémy Fabre [Thu, 22 Sep 2016 13:41:30 +0000 (15:41 +0200)]
Hide the bio block on mobile
Guillaume Pellerin [Thu, 22 Sep 2016 13:40:04 +0000 (15:40 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 22 Sep 2016 13:39:56 +0000 (15:39 +0200)]
update project detail template
projects / mezzo.git / log