git.inspyration.org Git - odoo/odoo.git/commit

author	Christophe Simonis <chs@odoo.com>
	Thu, 23 Oct 2014 15:14:35 +0000 (17:14 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Thu, 23 Oct 2014 15:14:35 +0000 (17:14 +0200)
commit	4b6c948be5a96207fb7ce1247ce7063c6f85120d
tree	d9c64ce95d10d941f86ca08afb9d0b9cb7b456a4	tree \| snapshot
parent	06d79d2fe59bc9d7bdcc3f2c17234599480b2aec	commit \| diff
parent	ed925892b936c926be5bad2b61a8219d1962e6f2	commit \| diff

[MERGE] forward port of branch 8.0 up to ed92589

20 files changed:

addons/account/account_invoice_view.xml	diff1 \|	diff2 \|	blob \| history
addons/calendar/calendar.py	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/js/mail.js	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/project/report/project_report.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/core.js	diff1 \|	diff2 \|	blob \| history
addons/web_graph/static/src/js/graph_widget.js	diff1 \|	diff2 \|	blob \| history
addons/website/models/website.py	diff1 \|	diff2 \|	blob \| history
addons/website/views/website_templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_forum/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/data/forum_data.xml	diff1 \|	diff2 \|	blob \| history
addons/website_forum/models/forum.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/static/src/js/website_forum.js	diff1 \|	diff2 \|	blob \| history
addons/website_forum/views/forum.xml	diff1 \|	diff2 \|	blob \| history
addons/website_forum/views/website_forum.xml	diff1 \|	diff2 \|	blob \| history
addons/website_mail/views/website_email_designer.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/views/templates.xml	diff1 \|	diff2 \|	blob \| history
openerp/models.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

addons/account/account_invoice_view.xml	diff1 \|	diff2 \|	blob \| history
addons/calendar/calendar.py	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/js/mail.js	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/project/report/project_report.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/core.js	diff1 \|	diff2 \|	blob \| history
addons/web_graph/static/src/js/graph_widget.js	diff1 \|	diff2 \|	blob \| history
addons/website/models/website.py	diff1 \|	diff2 \|	blob \| history
addons/website/views/website_templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_forum/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/data/forum_data.xml	diff1 \|	diff2 \|	blob \| history
addons/website_forum/models/forum.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/static/src/js/website_forum.js	diff1 \|	diff2 \|	blob \| history
addons/website_forum/views/forum.xml	diff1 \|	diff2 \|	blob \| history
addons/website_forum/views/website_forum.xml	diff1 \|	diff2 \|	blob \| history
addons/website_mail/views/website_email_designer.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/views/templates.xml	diff1 \|	diff2 \|	blob \| history
openerp/models.py	diff1 \|	diff2 \|	blob \| history