]>
git.parisson.com Git - mezzo.git/log
Emilie [Thu, 6 Oct 2016 13:34:11 +0000 (15:34 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 6 Oct 2016 13:33:31 +0000 (15:33 +0200)]
Template Tag : get classname
Guillaume Pellerin [Thu, 6 Oct 2016 12:50:14 +0000 (14:50 +0200)]
update locales
Guillaume Pellerin [Thu, 6 Oct 2016 12:48:36 +0000 (14:48 +0200)]
update locales
Guillaume Pellerin [Thu, 6 Oct 2016 12:45:59 +0000 (14:45 +0200)]
Update locales, partially fix event date display
Jérémy Fabre [Thu, 6 Oct 2016 12:02:34 +0000 (14:02 +0200)]
Fix TinyMCE config
Guillaume Pellerin [Thu, 6 Oct 2016 09:59:46 +0000 (11:59 +0200)]
Fix product first fields when multiple languages
Guillaume Pellerin [Thu, 6 Oct 2016 09:02:48 +0000 (11:02 +0200)]
Fix add products by allowing variations
Guillaume Pellerin [Wed, 5 Oct 2016 17:08:32 +0000 (19:08 +0200)]
Use installed mezzanine
Guillaume Pellerin [Wed, 5 Oct 2016 16:45:39 +0000 (18:45 +0200)]
Bump mezzanine install
Guillaume Pellerin [Wed, 5 Oct 2016 16:43:53 +0000 (18:43 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Wed, 5 Oct 2016 16:43:28 +0000 (18:43 +0200)]
Cleanup video_detail.html
Emilie [Wed, 5 Oct 2016 16:32:41 +0000 (18:32 +0200)]
Newsletter : add newsletter form
Emilie [Wed, 5 Oct 2016 16:03:34 +0000 (18:03 +0200)]
Article : add Audio/Video block and links to CustomPage
Emilie [Wed, 5 Oct 2016 14:45:50 +0000 (16:45 +0200)]
Merge branch 'network' into dev
Emilie [Wed, 5 Oct 2016 14:07:19 +0000 (16:07 +0200)]
Network : list geocoded organization
Guillaume Pellerin [Wed, 5 Oct 2016 13:18:44 +0000 (15:18 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Wed, 5 Oct 2016 13:18:23 +0000 (15:18 +0200)]
Add Event trainings and related data
Jérémy Fabre [Wed, 5 Oct 2016 13:10:44 +0000 (15:10 +0200)]
Add the booking button on the generic card
Jérémy Fabre [Wed, 5 Oct 2016 12:52:19 +0000 (14:52 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Wed, 5 Oct 2016 12:52:14 +0000 (14:52 +0200)]
Reduce the column margins in projet details
Guillaume Pellerin [Wed, 5 Oct 2016 11:58:55 +0000 (13:58 +0200)]
Re-ordering project list
Guillaume Pellerin [Wed, 5 Oct 2016 11:55:06 +0000 (13:55 +0200)]
Fix team (short) name display
Jérémy Fabre [Wed, 5 Oct 2016 08:41:12 +0000 (10:41 +0200)]
Add messages to job details
Guillaume Pellerin [Tue, 4 Oct 2016 16:26:49 +0000 (18:26 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Tue, 4 Oct 2016 16:00:23 +0000 (18:00 +0200)]
Add is_legacy and parent fields to Team, add second_team_text to Activity, fix various import methods
Jérémy Fabre [Tue, 4 Oct 2016 13:30:05 +0000 (15:30 +0200)]
Change the footer background color
Jérémy Fabre [Mon, 3 Oct 2016 15:27:36 +0000 (17:27 +0200)]
Fix the links in the yellow blocks
Jérémy Fabre [Mon, 3 Oct 2016 15:16:42 +0000 (17:16 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Mon, 3 Oct 2016 15:16:36 +0000 (17:16 +0200)]
Fix the bold font on lists
Guillaume Pellerin [Mon, 3 Oct 2016 11:20:51 +0000 (13:20 +0200)]
Add thumbs to orga list admin
Jérémy Fabre [Mon, 3 Oct 2016 09:54:58 +0000 (11:54 +0200)]
Add page files template
Jérémy Fabre [Mon, 3 Oct 2016 09:28:01 +0000 (11:28 +0200)]
Candidacies list
Emilie [Fri, 30 Sep 2016 17:42:22 +0000 (19:42 +0200)]
Job: add buttons
Emilie [Fri, 30 Sep 2016 17:22:45 +0000 (19:22 +0200)]
Candidate : two buttons + dates
Emilie [Fri, 30 Sep 2016 13:15:38 +0000 (15:15 +0200)]
Candidacy : display only published elements
Emilie [Fri, 30 Sep 2016 12:54:40 +0000 (14:54 +0200)]
Candidacy: done. Need more info about buttons but candidacies can be templated.
Jérémy Fabre [Fri, 30 Sep 2016 08:35:33 +0000 (10:35 +0200)]
Job list implementation
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
projects / mezzo.git / log