]>
git.parisson.com Git - mezzo.git/log
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
Jérémy Fabre [Thu, 22 Sep 2016 13:36:44 +0000 (15:36 +0200)]
Add the highlighted paragraph style to TinyMCE
Guillaume Pellerin [Thu, 22 Sep 2016 13:25:29 +0000 (15:25 +0200)]
Use submodule update
Guillaume Pellerin [Thu, 22 Sep 2016 13:19:58 +0000 (15:19 +0200)]
Use master branch only for submodules, prespare project detail template
Guillaume Pellerin [Thu, 22 Sep 2016 12:48:00 +0000 (14:48 +0200)]
Add project models translations, add more ordering
Guillaume Pellerin [Wed, 21 Sep 2016 18:08:17 +0000 (20:08 +0200)]
Fix and remove some admin menus
Guillaume Pellerin [Wed, 21 Sep 2016 17:59:08 +0000 (19:59 +0200)]
Exclude generic models from admin
Guillaume Pellerin [Wed, 21 Sep 2016 17:45:44 +0000 (19:45 +0200)]
Add ProjectTopic, re-organize admin menu
Emilie [Wed, 21 Sep 2016 17:32:50 +0000 (19:32 +0200)]
gMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Wed, 21 Sep 2016 17:32:00 +0000 (19:32 +0200)]
Pattern : pattern supporting functions of top level parent
Guillaume Pellerin [Wed, 21 Sep 2016 17:22:22 +0000 (19:22 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Wed, 21 Sep 2016 17:18:58 +0000 (19:18 +0200)]
Fix project_status property
Guillaume Pellerin [Wed, 21 Sep 2016 17:15:06 +0000 (19:15 +0200)]
Rename period date fields, add project status property
Emilie [Wed, 21 Sep 2016 16:24:06 +0000 (18:24 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Wed, 21 Sep 2016 16:23:54 +0000 (18:23 +0200)]
Person List: only admin user can access autocomplete url
Jérémy Fabre [Wed, 21 Sep 2016 15:50:11 +0000 (17:50 +0200)]
Well... Display the description on the person block, and, display the bio if the description is not available
Jérémy Fabre [Wed, 21 Sep 2016 15:48:26 +0000 (17:48 +0200)]
Person block : display the description if the bio is not available
Jérémy Fabre [Wed, 21 Sep 2016 14:57:58 +0000 (16:57 +0200)]
Add person list circle and square
Jérémy Fabre [Wed, 21 Sep 2016 14:57:34 +0000 (16:57 +0200)]
Fix the buttons margin and padding
Emilie [Wed, 21 Sep 2016 13:51:49 +0000 (15:51 +0200)]
Link : correcting link icone
Emilie [Wed, 21 Sep 2016 13:11:39 +0000 (15:11 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into block-person2
Emilie [Wed, 21 Sep 2016 13:05:08 +0000 (15:05 +0200)]
Link type : using font-awesome with class and link type name
Emilie [Wed, 21 Sep 2016 12:47:40 +0000 (14:47 +0200)]
Block Person : two lists types template
Jérémy Fabre [Tue, 20 Sep 2016 15:24:45 +0000 (17:24 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Tue, 20 Sep 2016 15:24:40 +0000 (17:24 +0200)]
Fix the links
Guillaume Pellerin [Tue, 20 Sep 2016 14:49:56 +0000 (16:49 +0200)]
Add django-prestashop submodule
Guillaume Pellerin [Tue, 20 Sep 2016 13:57:48 +0000 (15:57 +0200)]
Add event sync command
Jérémy Fabre [Tue, 20 Sep 2016 08:24:42 +0000 (10:24 +0200)]
Remove the title and the separator on the logo block
Jérémy Fabre [Tue, 20 Sep 2016 08:23:10 +0000 (10:23 +0200)]
Add the white buttons to TinyMCE
Jérémy Fabre [Tue, 20 Sep 2016 08:21:33 +0000 (10:21 +0200)]
Add a white button style
Jérémy Fabre [Tue, 20 Sep 2016 08:19:42 +0000 (10:19 +0200)]
Add margins on wysiwyg buttons
Jérémy Fabre [Tue, 20 Sep 2016 08:16:18 +0000 (10:16 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
projects / mezzo.git / log