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

author	Christophe Simonis <chs@odoo.com>
	Thu, 19 Jun 2014 14:13:35 +0000 (16:13 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Thu, 19 Jun 2014 14:13:35 +0000 (16:13 +0200)
commit	adf07a9490436211d16da8b1355c3bae4448a54a
tree	ceab9f348148bd97729209cde4cc892ea1b195a7	tree \| snapshot
parent	6618a9a1e5067444eedba4ac3c5c3c843a74798c	commit \| diff
parent	5087612d1da85a8661f7aa124969b2ee9e155c10	commit \| diff

[MERGE] forward port of branch saas-4 up to 5087612

23 files changed:

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account_analytic_analysis/account_analytic_analysis.py	diff1 \|	diff2 \|	blob \| history
addons/auth_oauth/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/gamification/models/challenge.py	diff1 \|	diff2 \|	blob \| history
addons/google_calendar/google_calendar.py	diff1 \|	diff2 \|	blob \| history
addons/hr/hr_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/project/project_demo.xml	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.css	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.sass	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web_calendar/static/src/js/web_calendar.js	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/js/website.editor.js	diff1 \|	diff2 \|	blob \| history
addons/website_forum/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/static/src/js/website_forum.js	diff1 \|	diff2 \|	blob \| history
addons/website_mail/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_mail/views/website_mail.xml	diff1 \|	diff2 \|	blob \| history
addons/website_mail_group/views/snippets.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_actions.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history

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

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account_analytic_analysis/account_analytic_analysis.py	diff1 \|	diff2 \|	blob \| history
addons/auth_oauth/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/gamification/models/challenge.py	diff1 \|	diff2 \|	blob \| history
addons/google_calendar/google_calendar.py	diff1 \|	diff2 \|	blob \| history
addons/hr/hr_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/project/project_demo.xml	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.css	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.sass	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web_calendar/static/src/js/web_calendar.js	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/js/website.editor.js	diff1 \|	diff2 \|	blob \| history
addons/website_forum/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/static/src/js/website_forum.js	diff1 \|	diff2 \|	blob \| history
addons/website_mail/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_mail/views/website_mail.xml	diff1 \|	diff2 \|	blob \| history
addons/website_mail_group/views/snippets.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_actions.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history