]> git.parisson.com Git - mezzo.git/log
mezzo.git
8 years agoFix the links style in yellow blocks
Jérémy Fabre [Fri, 23 Sep 2016 10:28:20 +0000 (12:28 +0200)]
Fix the links style in yellow blocks

8 years agoAdd the department to event generic card and slider templates
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

8 years agoHome events in body and slider
Jérémy Fabre [Fri, 23 Sep 2016 09:57:00 +0000 (11:57 +0200)]
Home events in body and slider

8 years agoWoops commit
Jérémy Fabre [Fri, 23 Sep 2016 09:45:25 +0000 (11:45 +0200)]
Woops commit

8 years agoFix lists
Jérémy Fabre [Fri, 23 Sep 2016 09:41:18 +0000 (11:41 +0200)]
Fix lists

8 years agoAdd the videos slider to projects
Jérémy Fabre [Fri, 23 Sep 2016 09:39:46 +0000 (11:39 +0200)]
Add the videos slider to projects

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
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

8 years agoFirst implementation of project topic details
Jérémy Fabre [Fri, 23 Sep 2016 09:34:16 +0000 (11:34 +0200)]
First implementation of project topic details

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
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

8 years agoHome : Add events
Emilie [Fri, 23 Sep 2016 09:33:32 +0000 (11:33 +0200)]
Home : Add events

8 years agoAdd project links, fix no project dates
Guillaume Pellerin [Fri, 23 Sep 2016 09:18:50 +0000 (11:18 +0200)]
Add project links, fix no project dates

8 years agoFix project topic list
Guillaume Pellerin [Fri, 23 Sep 2016 09:12:51 +0000 (11:12 +0200)]
Fix project topic list

8 years agoFix data pull, ad sub_topic filter
Guillaume Pellerin [Fri, 23 Sep 2016 08:38:51 +0000 (10:38 +0200)]
Fix data pull, ad sub_topic filter

8 years agoPerson list: invert lastname and firstname
Emilie [Fri, 23 Sep 2016 08:29:28 +0000 (10:29 +0200)]
Person list: invert lastname and firstname

8 years agoRe-fix the links in ul
Jérémy Fabre [Fri, 23 Sep 2016 08:21:34 +0000 (10:21 +0200)]
Re-fix the links in ul

8 years agoAdd links to Department, Team and Project pages
Jérémy Fabre [Fri, 23 Sep 2016 08:12:41 +0000 (10:12 +0200)]
Add links to Department, Team and Project pages

8 years agoFix the links in ul
Jérémy Fabre [Fri, 23 Sep 2016 08:12:24 +0000 (10:12 +0200)]
Fix the links in ul

8 years agoLinked websites with LinkType
Jérémy Fabre [Fri, 23 Sep 2016 08:00:30 +0000 (10:00 +0200)]
Linked websites with LinkType

8 years agoRemove debug on audio player
Jérémy Fabre [Thu, 22 Sep 2016 16:14:45 +0000 (18:14 +0200)]
Remove debug on audio player

8 years agoAdd optional breadcrumb on project page
Jérémy Fabre [Thu, 22 Sep 2016 16:13:47 +0000 (18:13 +0200)]
Add optional breadcrumb on project page

8 years agoFix logos
Jérémy Fabre [Thu, 22 Sep 2016 16:13:37 +0000 (18:13 +0200)]
Fix logos

8 years agoAdd some margins to project details, add the breadcrumb
Jérémy Fabre [Thu, 22 Sep 2016 15:54:44 +0000 (17:54 +0200)]
Add some margins to project details, add the breadcrumb

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
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

8 years agoFix the logos, and add the project details implementation
Jérémy Fabre [Thu, 22 Sep 2016 15:47:00 +0000 (17:47 +0200)]
Fix the logos, and add the project details implementation

8 years agoAdd block title
Guillaume Pellerin [Thu, 22 Sep 2016 15:32:54 +0000 (17:32 +0200)]
Add block title

8 years agoAdd department to ProjectDetailView context
Guillaume Pellerin [Thu, 22 Sep 2016 15:26:21 +0000 (17:26 +0200)]
Add department to ProjectDetailView context

8 years agoFix topic list display
Guillaume Pellerin [Thu, 22 Sep 2016 14:48:29 +0000 (16:48 +0200)]
Fix topic list display

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
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

8 years agoAdd ProjectTopicPage template
Guillaume Pellerin [Thu, 22 Sep 2016 14:43:40 +0000 (16:43 +0200)]
Add ProjectTopicPage template

8 years agoAdd ProjectTopicPage
Guillaume Pellerin [Thu, 22 Sep 2016 14:43:08 +0000 (16:43 +0200)]
Add ProjectTopicPage

8 years agoPause all audio if we play one
Jérémy Fabre [Thu, 22 Sep 2016 14:37:26 +0000 (16:37 +0200)]
Pause all audio if we play one

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
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

8 years agoNew audio player
Jérémy Fabre [Thu, 22 Sep 2016 14:28:41 +0000 (16:28 +0200)]
New audio player

8 years agoFix br
Guillaume Pellerin [Thu, 22 Sep 2016 13:50:55 +0000 (15:50 +0200)]
Fix br

8 years agoFix various blocks
Guillaume Pellerin [Thu, 22 Sep 2016 13:49:59 +0000 (15:49 +0200)]
Fix various blocks

8 years agoFix project detail block
Guillaume Pellerin [Thu, 22 Sep 2016 13:44:19 +0000 (15:44 +0200)]
Fix project detail block

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
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

8 years agoFix logos
Guillaume Pellerin [Thu, 22 Sep 2016 13:43:08 +0000 (15:43 +0200)]
Fix logos

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
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

8 years agoFix the home banners on homepage
Jérémy Fabre [Thu, 22 Sep 2016 13:41:42 +0000 (15:41 +0200)]
Fix the home banners on homepage

8 years agoHide the bio block on mobile
Jérémy Fabre [Thu, 22 Sep 2016 13:41:30 +0000 (15:41 +0200)]
Hide the bio block on mobile

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
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

8 years agoupdate project detail template
Guillaume Pellerin [Thu, 22 Sep 2016 13:39:56 +0000 (15:39 +0200)]
update project detail template

8 years agoAdd the highlighted paragraph style to TinyMCE
Jérémy Fabre [Thu, 22 Sep 2016 13:36:44 +0000 (15:36 +0200)]
Add the highlighted paragraph style to TinyMCE

8 years agoUse submodule update
Guillaume Pellerin [Thu, 22 Sep 2016 13:25:29 +0000 (15:25 +0200)]
Use submodule update

8 years agoUse master branch only for submodules, prespare project detail template
Guillaume Pellerin [Thu, 22 Sep 2016 13:19:58 +0000 (15:19 +0200)]
Use master branch only for submodules, prespare project detail template

8 years agoAdd project models translations, add more ordering
Guillaume Pellerin [Thu, 22 Sep 2016 12:48:00 +0000 (14:48 +0200)]
Add project models translations, add more ordering

8 years agoFix and remove some admin menus
Guillaume Pellerin [Wed, 21 Sep 2016 18:08:17 +0000 (20:08 +0200)]
Fix and remove some admin menus

8 years agoExclude generic models from admin
Guillaume Pellerin [Wed, 21 Sep 2016 17:59:08 +0000 (19:59 +0200)]
Exclude generic models from admin

8 years agoAdd ProjectTopic, re-organize admin menu
Guillaume Pellerin [Wed, 21 Sep 2016 17:45:44 +0000 (19:45 +0200)]
Add ProjectTopic, re-organize admin menu

8 years agogMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
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

8 years agoPattern : pattern supporting functions of top level parent
Emilie [Wed, 21 Sep 2016 17:32:00 +0000 (19:32 +0200)]
Pattern : pattern supporting functions of top level parent

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
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

8 years agoFix project_status property
Guillaume Pellerin [Wed, 21 Sep 2016 17:18:58 +0000 (19:18 +0200)]
Fix project_status property

8 years agoRename period date fields, add project status property
Guillaume Pellerin [Wed, 21 Sep 2016 17:15:06 +0000 (19:15 +0200)]
Rename period date fields, add project status property

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
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

8 years agoPerson List: only admin user can access autocomplete url
Emilie [Wed, 21 Sep 2016 16:23:54 +0000 (18:23 +0200)]
Person List: only admin user can access autocomplete url

8 years agoWell... Display the description on the person block, and, display the bio if the...
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

8 years agoPerson block : display the description if the bio 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

8 years agoAdd person list circle and square
Jérémy Fabre [Wed, 21 Sep 2016 14:57:58 +0000 (16:57 +0200)]
Add person list circle and square

8 years agoFix the buttons margin and padding
Jérémy Fabre [Wed, 21 Sep 2016 14:57:34 +0000 (16:57 +0200)]
Fix the buttons margin and padding

8 years agoLink : correcting link icone
Emilie [Wed, 21 Sep 2016 13:51:49 +0000 (15:51 +0200)]
Link : correcting link icone

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into block-person2
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

8 years agoLink type : using font-awesome with class and link type name
Emilie [Wed, 21 Sep 2016 13:05:08 +0000 (15:05 +0200)]
Link type : using font-awesome with class and link type name

8 years agoBlock Person : two lists types template
Emilie [Wed, 21 Sep 2016 12:47:40 +0000 (14:47 +0200)]
Block Person : two lists types template

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
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

8 years agoFix the links
Jérémy Fabre [Tue, 20 Sep 2016 15:24:40 +0000 (17:24 +0200)]
Fix the links

8 years agoAdd django-prestashop submodule
Guillaume Pellerin [Tue, 20 Sep 2016 14:49:56 +0000 (16:49 +0200)]
Add django-prestashop submodule

8 years agoAdd event sync command
Guillaume Pellerin [Tue, 20 Sep 2016 13:57:48 +0000 (15:57 +0200)]
Add event sync command

8 years agoRemove the title and the separator on the logo block
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

8 years agoAdd the white buttons to TinyMCE
Jérémy Fabre [Tue, 20 Sep 2016 08:23:10 +0000 (10:23 +0200)]
Add the white buttons to TinyMCE

8 years agoAdd a white button style
Jérémy Fabre [Tue, 20 Sep 2016 08:21:33 +0000 (10:21 +0200)]
Add a white button style

8 years agoAdd margins on wysiwyg buttons
Jérémy Fabre [Tue, 20 Sep 2016 08:19:42 +0000 (10:19 +0200)]
Add margins on wysiwyg buttons

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
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

8 years agoAdd the summary links on the primary pages if the page has no children
Jérémy Fabre [Tue, 20 Sep 2016 08:15:51 +0000 (10:15 +0200)]
Add the summary links on the primary pages if the page has no children

8 years agoPerson List: saving code... some issue with reverse request > can't access Person
Emilie [Mon, 19 Sep 2016 21:14:24 +0000 (23:14 +0200)]
Person List: saving code... some issue with reverse request > can't access Person

8 years agoMergin
Emilie [Mon, 19 Sep 2016 14:23:04 +0000 (16:23 +0200)]
Mergin

8 years agoAdd project topics
Guillaume Pellerin [Fri, 16 Sep 2016 16:38:20 +0000 (18:38 +0200)]
Add project topics

8 years agoPerson Block : Simple autocomplete on one FK instead on GFK
Emilie [Fri, 16 Sep 2016 16:29:07 +0000 (18:29 +0200)]
Person Block : Simple autocomplete on one FK instead on GFK

8 years agoFirst complete person data import (beta version)
Guillaume Pellerin [Fri, 16 Sep 2016 12:46:54 +0000 (14:46 +0200)]
First complete person data import (beta version)

8 years agoPerson list : dynamic content in page with GenericFK
Emilie [Fri, 16 Sep 2016 10:47:49 +0000 (12:47 +0200)]
Person list : dynamic content in page with GenericFK

8 years agoAdd date echo to push script
Guillaume Pellerin [Fri, 16 Sep 2016 09:22:18 +0000 (11:22 +0200)]
Add date echo to push script

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 15 Sep 2016 16:08:22 +0000 (18:08 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

Conflicts:
app/organization/shop/urls.py
app/organization/urls.py

8 years agoEvent details first implementation
Jérémy Fabre [Thu, 15 Sep 2016 14:45:02 +0000 (16:45 +0200)]
Event details first implementation

8 years agoArticle template fix
Jérémy Fabre [Thu, 15 Sep 2016 14:44:52 +0000 (16:44 +0200)]
Article template fix

8 years agoTry something with sticky kit
Jérémy Fabre [Thu, 15 Sep 2016 14:44:40 +0000 (16:44 +0200)]
Try something with sticky kit

8 years agoAdd some new styles
Jérémy Fabre [Thu, 15 Sep 2016 14:44:09 +0000 (16:44 +0200)]
Add some new styles

8 years agoFox the nav tree
Jérémy Fabre [Thu, 15 Sep 2016 14:43:56 +0000 (16:43 +0200)]
Fox the nav tree

8 years agoFix button style in page blocks
Jérémy Fabre [Thu, 15 Sep 2016 14:19:16 +0000 (16:19 +0200)]
Fix button style in page blocks

8 years agoFix the service banners margins
Jérémy Fabre [Thu, 15 Sep 2016 12:18:06 +0000 (14:18 +0200)]
Fix the service banners margins

8 years agoImplementation of the partners list
Jérémy Fabre [Thu, 15 Sep 2016 12:07:35 +0000 (14:07 +0200)]
Implementation of the partners list

8 years agoFix some block margins
Jérémy Fabre [Thu, 15 Sep 2016 12:07:17 +0000 (14:07 +0200)]
Fix some block margins

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 15 Sep 2016 10:55:57 +0000 (12:55 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

8 years agoFix the yellow button style
Jérémy Fabre [Thu, 15 Sep 2016 10:55:41 +0000 (12:55 +0200)]
Fix the yellow button style

8 years agoLogo : deleting thumbnail 100x100
Emilie [Thu, 15 Sep 2016 10:46:23 +0000 (12:46 +0200)]
Logo : deleting thumbnail 100x100

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 15 Sep 2016 10:27:33 +0000 (12:27 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

8 years agoCustomPage, DepartmentPage, TeamPage: add logo at bottom of the page
Emilie [Thu, 15 Sep 2016 10:27:24 +0000 (12:27 +0200)]
CustomPage, DepartmentPage, TeamPage: add logo at bottom of the page

8 years agoRemove top margin on page block if there is a separator
Jérémy Fabre [Thu, 15 Sep 2016 10:23:25 +0000 (12:23 +0200)]
Remove top margin on page block if there is a separator

8 years agoAdd h3 style
Jérémy Fabre [Thu, 15 Sep 2016 10:23:09 +0000 (12:23 +0200)]
Add h3 style

8 years agoAdd content css to TinyMCE
Jérémy Fabre [Thu, 15 Sep 2016 09:57:45 +0000 (11:57 +0200)]
Add content css to TinyMCE