]>
git.parisson.com Git - mezzo.git/log
Guillaume Pellerin [Thu, 25 Aug 2016 15:59:19 +0000 (17:59 +0200)]
Fix event images against get_type filter
Guillaume Pellerin [Thu, 25 Aug 2016 15:40:14 +0000 (17:40 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 25 Aug 2016 15:40:04 +0000 (17:40 +0200)]
Fix event images
Emilie [Thu, 25 Aug 2016 15:36:33 +0000 (17:36 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 25 Aug 2016 15:36:24 +0000 (17:36 +0200)]
Correcting page sliders
Guillaume Pellerin [Thu, 25 Aug 2016 15:23:05 +0000 (17:23 +0200)]
Fix event tag list
Guillaume Pellerin [Thu, 25 Aug 2016 15:17:21 +0000 (17:17 +0200)]
Add collecstatic.sh
Guillaume Pellerin [Thu, 25 Aug 2016 15:15:10 +0000 (17:15 +0200)]
Add custom admin styles, increase tree width
Guillaume Pellerin [Thu, 25 Aug 2016 14:31:52 +0000 (16:31 +0200)]
Add agenda module inheriting from mezzanine_agenda.models.Event, add related blocks and images
Emilie [Thu, 25 Aug 2016 14:23:05 +0000 (16:23 +0200)]
Task #134: reverse relating between articles and topics
Emilie [Thu, 25 Aug 2016 13:36:05 +0000 (15:36 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 25 Aug 2016 13:35:56 +0000 (15:35 +0200)]
Task #134: Article related to department
Guillaume Pellerin [Thu, 25 Aug 2016 10:40:23 +0000 (12:40 +0200)]
Cron push rule applied at 6h periods only
Emilie [Wed, 24 Aug 2016 17:05:56 +0000 (19:05 +0200)]
rename image type content into page_slider
Emilie [Wed, 24 Aug 2016 14:41:21 +0000 (16:41 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Wed, 24 Aug 2016 14:41:13 +0000 (16:41 +0200)]
Autocomplete : commenting event
Guillaume Pellerin [Wed, 24 Aug 2016 14:17:14 +0000 (16:17 +0200)]
Fix page card
Guillaume Pellerin [Wed, 24 Aug 2016 13:51:02 +0000 (15:51 +0200)]
Make related block and image fully generic
Guillaume Pellerin [Wed, 24 Aug 2016 13:47:05 +0000 (15:47 +0200)]
Add more lorem
Guillaume Pellerin [Wed, 24 Aug 2016 13:31:27 +0000 (15:31 +0200)]
Fix page card again
Guillaume Pellerin [Wed, 24 Aug 2016 13:29:29 +0000 (15:29 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Wed, 24 Aug 2016 13:29:15 +0000 (15:29 +0200)]
Fix page card
Guillaume Pellerin [Wed, 24 Aug 2016 13:17:03 +0000 (15:17 +0200)]
Fix page car image
Emilie [Wed, 24 Aug 2016 13:04:02 +0000 (15:04 +0200)]
Fix : articles / homes
Guillaume Pellerin [Wed, 24 Aug 2016 13:01:13 +0000 (15:01 +0200)]
Fix article department page
Guillaume Pellerin [Wed, 24 Aug 2016 12:55:28 +0000 (14:55 +0200)]
Image.type required
Guillaume Pellerin [Wed, 24 Aug 2016 12:44:02 +0000 (14:44 +0200)]
Fix header for first page tree
Guillaume Pellerin [Wed, 24 Aug 2016 11:01:59 +0000 (13:01 +0200)]
Fix font-awesome URL
Guillaume Pellerin [Wed, 24 Aug 2016 10:55:40 +0000 (12:55 +0200)]
CustomPage: add automatic lorem ipsum content, fix blocks
Guillaume Pellerin [Wed, 24 Aug 2016 10:14:15 +0000 (12:14 +0200)]
Fix custompage template
Guillaume Pellerin [Tue, 23 Aug 2016 22:29:34 +0000 (00:29 +0200)]
Fix run condition
Guillaume Pellerin [Tue, 23 Aug 2016 22:27:25 +0000 (00:27 +0200)]
Really use bash
Guillaume Pellerin [Tue, 23 Aug 2016 22:26:09 +0000 (00:26 +0200)]
Use bash
Guillaume Pellerin [Tue, 23 Aug 2016 22:21:04 +0000 (00:21 +0200)]
Update initial migrations
Guillaume Pellerin [Tue, 23 Aug 2016 19:31:53 +0000 (21:31 +0200)]
No local mezzanine
Guillaume Pellerin [Tue, 23 Aug 2016 18:26:29 +0000 (20:26 +0200)]
Fix no home content, fix slider and home images
Guillaume Pellerin [Tue, 23 Aug 2016 17:51:19 +0000 (19:51 +0200)]
Complete refactoring with more generic blocks, images, links, etc thanks to meta classes
Guillaume Pellerin [Tue, 23 Aug 2016 14:12:02 +0000 (16:12 +0200)]
WARNING: huge refactoring! add DepatmentPage and TeamPage, rename modules, add various data
Guillaume Pellerin [Tue, 23 Aug 2016 05:52:13 +0000 (07:52 +0200)]
Add various person activity data
Guillaume Pellerin [Fri, 19 Aug 2016 19:51:54 +0000 (21:51 +0200)]
Add varion person data
Emilie [Fri, 19 Aug 2016 18:01:32 +0000 (20:01 +0200)]
Home : Body content (brief + others content) + deleting featured_tag
Guillaume Pellerin [Fri, 19 Aug 2016 17:22:04 +0000 (19:22 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Fri, 19 Aug 2016 17:21:41 +0000 (19:21 +0200)]
Add period to project
Guillaume Pellerin [Fri, 19 Aug 2016 17:13:26 +0000 (19:13 +0200)]
Rm featured modules, rm EventCategory
Emilie [Fri, 19 Aug 2016 16:12:50 +0000 (18:12 +0200)]
Home : moving shutter card
Guillaume Pellerin [Fri, 19 Aug 2016 16:02:12 +0000 (18:02 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 19 Aug 2016 16:01:03 +0000 (18:01 +0200)]
Home : slider + repair debug bar tool
Guillaume Pellerin [Fri, 19 Aug 2016 14:37:50 +0000 (16:37 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Fri, 19 Aug 2016 14:37:29 +0000 (16:37 +0200)]
Move Photo to core
Emilie [Fri, 19 Aug 2016 14:07:45 +0000 (16:07 +0200)]
Home : Tabular Generic Orderable inline
Guillaume Pellerin [Fri, 19 Aug 2016 13:50:24 +0000 (15:50 +0200)]
Use branch mezzanine@jquery
Guillaume Pellerin [Fri, 19 Aug 2016 13:35:08 +0000 (15:35 +0200)]
Use mezzanine master branch
Emilie [Fri, 19 Aug 2016 10:47:25 +0000 (12:47 +0200)]
Home : regenerating migrate files
Emilie [Thu, 18 Aug 2016 17:23:39 +0000 (19:23 +0200)]
Abstract DynamicContent + DynamicContentHomeSlider + DynamicContentHomeBody
Guillaume Pellerin [Thu, 18 Aug 2016 15:48:04 +0000 (17:48 +0200)]
Make blocks orderable
Guillaume Pellerin [Thu, 18 Aug 2016 14:53:18 +0000 (16:53 +0200)]
Add migration
Guillaume Pellerin [Thu, 18 Aug 2016 11:23:28 +0000 (13:23 +0200)]
Fix chmods
Guillaume Pellerin [Thu, 18 Aug 2016 11:22:02 +0000 (13:22 +0200)]
Merge branch 'orderable' into dev
Conflicts:
app/scripts/app.sh
Guillaume Pellerin [Thu, 18 Aug 2016 11:19:24 +0000 (13:19 +0200)]
Fix inlines ordering using a custom mezzanine version upgrading admin jquery(-ui) and fixing dynamic-inlines.js
Emilie [Thu, 18 Aug 2016 10:43:47 +0000 (12:43 +0200)]
Brief: add autocomplete fields on Events, Articles and BasicPage for local links
Guillaume Pellerin [Wed, 17 Aug 2016 18:22:29 +0000 (20:22 +0200)]
Use titles for autocompletion, bump mezzanine version to 4.2
Guillaume Pellerin [Wed, 17 Aug 2016 18:07:01 +0000 (20:07 +0200)]
Fix Brief autocomplete form
Emilie [Wed, 17 Aug 2016 17:34:13 +0000 (19:34 +0200)]
Autocomplete Light + Uninstalled Orderable
Guillaume Pellerin [Wed, 17 Aug 2016 14:33:38 +0000 (16:33 +0200)]
cleanup
Guillaume Pellerin [Wed, 17 Aug 2016 14:33:21 +0000 (16:33 +0200)]
mv admin templates
Guillaume Pellerin [Wed, 17 Aug 2016 09:24:16 +0000 (11:24 +0200)]
Add original admin templates
Guillaume Pellerin [Wed, 17 Aug 2016 09:24:06 +0000 (11:24 +0200)]
Bugfix
Guillaume Pellerin [Tue, 16 Aug 2016 17:11:54 +0000 (19:11 +0200)]
Fix related names
Jérémy Fabre [Sat, 13 Aug 2016 09:32:13 +0000 (11:32 +0200)]
Fix a lot of templates
Emilie [Fri, 12 Aug 2016 13:52:44 +0000 (15:52 +0200)]
ignore data/var
Emilie [Fri, 12 Aug 2016 13:31:07 +0000 (15:31 +0200)]
Department : adding pattern selector + slider block
Jérémy Fabre [Fri, 12 Aug 2016 11:45:29 +0000 (13:45 +0200)]
Fix the page, basicpage, department and article templates.
Emilie [Fri, 12 Aug 2016 10:52:14 +0000 (12:52 +0200)]
Create generic template for slider
Emilie [Thu, 11 Aug 2016 09:12:49 +0000 (11:12 +0200)]
Adding related article to Department
Emilie [Thu, 11 Aug 2016 08:47:41 +0000 (10:47 +0200)]
Breadcrumb for article, depends from where user is coming. Department or Topic.
Guillaume Pellerin [Tue, 9 Aug 2016 13:01:46 +0000 (15:01 +0200)]
Make more abtract classes and linked resources (images, blocks, etc)
Guillaume Pellerin [Sun, 7 Aug 2016 15:38:18 +0000 (17:38 +0200)]
Fix stacked inlines thanks to a special grapelli branch, add various admin filters
Guillaume Pellerin [Sun, 7 Aug 2016 10:01:42 +0000 (12:01 +0200)]
Update locales
Guillaume Pellerin [Sun, 7 Aug 2016 09:50:39 +0000 (11:50 +0200)]
collectstatic only in prod
Emilie [Fri, 5 Aug 2016 16:37:33 +0000 (18:37 +0200)]
Orderable Briefs on Home
Emilie [Thu, 4 Aug 2016 16:44:43 +0000 (18:44 +0200)]
Page Card : more generic
Emilie [Thu, 4 Aug 2016 15:40:06 +0000 (17:40 +0200)]
Topic is a page and can be added to menu Magazine. New template for topic card.
Jérémy Fabre [Thu, 4 Aug 2016 09:16:29 +0000 (11:16 +0200)]
Merge branch 'wip' into dev
Jérémy Fabre [Thu, 4 Aug 2016 09:14:54 +0000 (11:14 +0200)]
Topic details first implementation
Jérémy Fabre [Thu, 4 Aug 2016 09:14:34 +0000 (11:14 +0200)]
Fix the article box style
Jérémy Fabre [Thu, 4 Aug 2016 09:14:21 +0000 (11:14 +0200)]
Update the page card
Jérémy Fabre [Thu, 4 Aug 2016 09:14:06 +0000 (11:14 +0200)]
Update the meta title block base
Jérémy Fabre [Thu, 4 Aug 2016 09:13:49 +0000 (11:13 +0200)]
Add media_tags and a new filter for photo alignment normalization
Guillaume Pellerin [Thu, 4 Aug 2016 08:11:16 +0000 (10:11 +0200)]
Remove the watchdog for static files (should me done by cron or by hand on server side in production)
Emilie [Wed, 3 Aug 2016 16:17:15 +0000 (18:17 +0200)]
Admin Page : List items by menu
Emilie [Wed, 3 Aug 2016 14:03:07 +0000 (16:03 +0200)]
Admin Page : resolving select issue in tree
Emilie [Fri, 29 Jul 2016 12:35:48 +0000 (14:35 +0200)]
upgrade.sh : update a dev/prod server
Emilie [Fri, 29 Jul 2016 12:05:41 +0000 (14:05 +0200)]
Task #125 #126: adding topics list on home and create page detail
Emilie [Thu, 28 Jul 2016 14:53:22 +0000 (16:53 +0200)]
Task #73: hide field related_posts in admin. Please use related_articles.
Emilie [Thu, 28 Jul 2016 14:42:36 +0000 (16:42 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into article
Emilie [Thu, 28 Jul 2016 14:42:28 +0000 (16:42 +0200)]
Task #73 #84: Article card + detail
Jérémy Fabre [Wed, 27 Jul 2016 15:48:42 +0000 (17:48 +0200)]
Add the with_separator implementation on PageBlock
Jérémy Fabre [Wed, 27 Jul 2016 15:32:35 +0000 (17:32 +0200)]
Add photo_card in page_card template
Jérémy Fabre [Wed, 27 Jul 2016 14:48:02 +0000 (16:48 +0200)]
Merge branch 'wip' into dev
Jérémy Fabre [Wed, 27 Jul 2016 14:43:43 +0000 (16:43 +0200)]
Implement the page_block style