]>
git.parisson.com Git - mezzo.git/log
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
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
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
Emilie [Mon, 19 Sep 2016 14:23:04 +0000 (16:23 +0200)]
Mergin
Guillaume Pellerin [Fri, 16 Sep 2016 16:38:20 +0000 (18:38 +0200)]
Add project topics
Emilie [Fri, 16 Sep 2016 16:29:07 +0000 (18:29 +0200)]
Person Block : Simple autocomplete on one FK instead on GFK
Guillaume Pellerin [Fri, 16 Sep 2016 12:46:54 +0000 (14:46 +0200)]
First complete person data import (beta version)
Emilie [Fri, 16 Sep 2016 10:47:49 +0000 (12:47 +0200)]
Person list : dynamic content in page with GenericFK
Guillaume Pellerin [Fri, 16 Sep 2016 09:22:18 +0000 (11:22 +0200)]
Add date echo to push script
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
Jérémy Fabre [Thu, 15 Sep 2016 14:45:02 +0000 (16:45 +0200)]
Event details first implementation
Jérémy Fabre [Thu, 15 Sep 2016 14:44:52 +0000 (16:44 +0200)]
Article template fix
Jérémy Fabre [Thu, 15 Sep 2016 14:44:40 +0000 (16:44 +0200)]
Try something with sticky kit
Jérémy Fabre [Thu, 15 Sep 2016 14:44:09 +0000 (16:44 +0200)]
Add some new styles
Jérémy Fabre [Thu, 15 Sep 2016 14:43:56 +0000 (16:43 +0200)]
Fox the nav tree
Jérémy Fabre [Thu, 15 Sep 2016 14:19:16 +0000 (16:19 +0200)]
Fix button style in page blocks
Jérémy Fabre [Thu, 15 Sep 2016 12:18:06 +0000 (14:18 +0200)]
Fix the service banners margins
Jérémy Fabre [Thu, 15 Sep 2016 12:07:35 +0000 (14:07 +0200)]
Implementation of the partners list
Jérémy Fabre [Thu, 15 Sep 2016 12:07:17 +0000 (14:07 +0200)]
Fix some block margins
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
Jérémy Fabre [Thu, 15 Sep 2016 10:55:41 +0000 (12:55 +0200)]
Fix the yellow button style
Emilie [Thu, 15 Sep 2016 10:46:23 +0000 (12:46 +0200)]
Logo : deleting thumbnail 100x100
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
Emilie [Thu, 15 Sep 2016 10:27:24 +0000 (12:27 +0200)]
CustomPage, DepartmentPage, TeamPage: add logo at bottom of the page
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
Jérémy Fabre [Thu, 15 Sep 2016 10:23:09 +0000 (12:23 +0200)]
Add h3 style
Jérémy Fabre [Thu, 15 Sep 2016 09:57:45 +0000 (11:57 +0200)]
Add content css to TinyMCE
Jérémy Fabre [Thu, 15 Sep 2016 09:55:41 +0000 (11:55 +0200)]
Add button styles to TinyMCE
Emilie [Thu, 15 Sep 2016 09:44:46 +0000 (11:44 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 15 Sep 2016 09:44:36 +0000 (11:44 +0200)]
Format Button : adding example format for buttons
Jérémy Fabre [Thu, 15 Sep 2016 09:40:19 +0000 (11:40 +0200)]
Add some button styles for TinyMCE
Jérémy Fabre [Thu, 15 Sep 2016 09:16:37 +0000 (11:16 +0200)]
Add a separator on the shutter items
Jérémy Fabre [Thu, 15 Sep 2016 08:51:34 +0000 (10:51 +0200)]
Change the links color in black page blocks
Jérémy Fabre [Thu, 15 Sep 2016 08:50:42 +0000 (10:50 +0200)]
Update padding on the shutters
Jérémy Fabre [Thu, 15 Sep 2016 08:43:02 +0000 (10:43 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 15 Sep 2016 08:42:22 +0000 (10:42 +0200)]
Fix the service banners (add rollover, add padding, add margin)
Emilie [Thu, 15 Sep 2016 08:40:40 +0000 (10:40 +0200)]
TinyMCE : error 500 on links button, related to unresolvable url of Products
Emilie [Wed, 14 Sep 2016 17:09:47 +0000 (19:09 +0200)]
CustomPage : add link type | Network : rename verbose name
Jérémy Fabre [Wed, 14 Sep 2016 16:22:33 +0000 (18:22 +0200)]
Fix the black page block style
Emilie [Wed, 14 Sep 2016 15:56:53 +0000 (17:56 +0200)]
Network : renaming verbose name
Jérémy Fabre [Wed, 14 Sep 2016 15:29:59 +0000 (17:29 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Wed, 14 Sep 2016 15:29:39 +0000 (17:29 +0200)]
Add services and bio on the homepage
Emilie [Wed, 14 Sep 2016 13:00:46 +0000 (15:00 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Wed, 14 Sep 2016 12:57:22 +0000 (14:57 +0200)]
Person - Organization : renaming fk key
Jérémy Fabre [Wed, 14 Sep 2016 10:21:33 +0000 (12:21 +0200)]
Pagination style implementation, and fix the pagination on the topic detail
Jérémy Fabre [Wed, 14 Sep 2016 10:04:04 +0000 (12:04 +0200)]
Remove breadcrumb on tablet/mobile
Jérémy Fabre [Wed, 14 Sep 2016 10:02:43 +0000 (12:02 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Wed, 14 Sep 2016 09:58:14 +0000 (11:58 +0200)]
Topic : paginate article / 4 per pages just for tests
Guillaume Pellerin [Mon, 12 Sep 2016 15:42:56 +0000 (17:42 +0200)]
Rename products module into shop
Jérémy Fabre [Mon, 12 Sep 2016 13:11:34 +0000 (15:11 +0200)]
Remove a development test
Jérémy Fabre [Mon, 12 Sep 2016 12:55:11 +0000 (14:55 +0200)]
Audio playlists style implementation
Jérémy Fabre [Mon, 12 Sep 2016 12:32:42 +0000 (14:32 +0200)]
Add some margins to the colored page blocks
projects / mezzo.git / log