Odoo - The current checkout of upstream Odoo

Age	Commit message (Collapse)	Author
2015-08-31	[MERGE] forward port of branch saas-6 up to 7faf72c	Christophe Simonis

2015-08-21	[IMP] web_editor: add document into the media editor	Christophe Matthieu
	User can upload documents and add the link in the page to download it.
2015-07-22	[MERGE] forward port of branch saas-6 up to 63e92cb	Christophe Simonis

2015-07-20	[IMP] web_editor,website: added scalable margins in less	David Monjoie
	The original commit by fka used to define less variables like this: @px-4: 4px @px-8: 8px The goal was to be able to change the margin values in media queries for smaller screens. However, as the less is only compiled once in css, those variables didn't really help as you couldn't redefine them from inside a media query and have the less magically reassign the margins on the fly. I created less helper functions to be able to easily redefine the margins for smaller screens from inside media queries. The task also required to replace the nbsp in the html by the newly created mr and ml classes. This is also the first phase of the sass -> less transition.
2015-07-10	[IMP] web_editor: add modal to translate node attributes	Christophe Matthieu

2015-07-10	[IMP] web_editor: split website into web_editor (to use editor in backend ↵	Christophe Matthieu
	for html field) and website