git.inspyration.org Git - odoo/odoo.git/commit - addons/web/static/src/js/chrome.js

author	Christophe Simonis <chs@odoo.com>
	Thu, 28 Aug 2014 14:42:17 +0000 (16:42 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Thu, 28 Aug 2014 14:51:11 +0000 (16:51 +0200)
commit	8046b7367d7892b582c7130d97a644f952173424
tree	6a3f82018b8bd2a8f7b9ffec43951af0de859c83	tree \| snapshot
parent	5e6e1303e3c49b157fe1e624eaca3b28167b55c7	commit \| diff
parent	7e117b18a01d55c85856050eba7f1983bc2c34e9	commit \| diff

[MERGE] forward port of branch saas-5 up to 7e117b1

21 files changed:

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/auth_ldap/users_ldap.py	diff1 \|	diff2 \|	blob \| history
addons/base_gengo/res_company.py	diff1 \|	diff2 \|	blob \| history
addons/board/static/src/js/dashboard.js	diff1 \|	diff2 \|	blob \| history
addons/delivery/stock.py	diff1 \|	diff2 \|	blob \| history
addons/email_template/wizard/mail_compose_message.py	diff1 \|	diff2 \|	blob \| history
addons/email_template/wizard/mail_compose_message_view.xml	diff1 \|	diff2 \|	blob \| history
addons/fetchmail/fetchmail.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_alias.py	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/js/announcement.js	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/product_visible_discount/product_visible_discount.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock_view.xml	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/chrome.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	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/addons/base/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
openerp/report/report_sxw.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/auth_ldap/users_ldap.py	diff1 \|	diff2 \|	blob \| history
addons/base_gengo/res_company.py	diff1 \|	diff2 \|	blob \| history
addons/board/static/src/js/dashboard.js	diff1 \|	diff2 \|	blob \| history
addons/delivery/stock.py	diff1 \|	diff2 \|	blob \| history
addons/email_template/wizard/mail_compose_message.py	diff1 \|	diff2 \|	blob \| history
addons/email_template/wizard/mail_compose_message_view.xml	diff1 \|	diff2 \|	blob \| history
addons/fetchmail/fetchmail.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_alias.py	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/js/announcement.js	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/product_visible_discount/product_visible_discount.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock_view.xml	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/chrome.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	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/addons/base/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
openerp/report/report_sxw.py	diff1 \|	diff2 \|	blob \| history