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

author	Richard Mathot (OpenERP) <rim@openerp.com>
	Mon, 20 Jan 2014 09:23:42 +0000 (10:23 +0100)
committer	Richard Mathot (OpenERP) <rim@openerp.com>
	Mon, 20 Jan 2014 09:23:42 +0000 (10:23 +0100)
commit	f529de5625f318f01db5c9a99c66b905caad7e5a
tree	834ee6f07c2a15c86b203a5132eee47e6c108b08	tree \| snapshot
parent	b3cf924bf83a866c8b0120188d39f956ab9d6fd1	commit \| diff

[FIX] Fixing merge problems

bzr revid: rim@openerp.com-20140120092342-k2dh91lwiktasf2v

53 files changed:

addons/crm_partner_assign/__openerp__.py		diff \| blob \| history
addons/email_template/email_template.py		diff \| blob \| history
addons/hr_timesheet/hr_timesheet_data.xml		diff \| blob \| history
addons/product/product_data.xml		diff \| blob \| history
addons/product/product_demo.xml		diff \| blob \| history
addons/product/product_view.xml		diff \| blob \| history
addons/sale/res_config.py		diff \| blob \| history
addons/sale/res_config_view.xml		diff \| blob \| history
addons/sale_stock/res_config.py		diff \| blob \| history
addons/sale_stock/res_config_view.xml		diff \| blob \| history
addons/website/controllers/main.py		diff \| blob \| history
addons/website/models/website.py		diff \| blob \| history
addons/website/static/src/css/Makefile		diff \| blob \| history
addons/website/static/src/css/editor.css		diff \| blob \| history
addons/website/static/src/css/editor.sass		diff \| blob \| history
addons/website/static/src/css/snippets.css		diff \| blob \| history
addons/website/static/src/css/snippets.sass	[deleted file]	blob \| history
addons/website/static/src/css/website.css		diff \| blob \| history
addons/website/static/src/css/website.sass		diff \| blob \| history
addons/website/static/src/img/blocks/block_features.png	[deleted file]	blob \| history
addons/website/static/src/img/under_construction.png	[deleted file]	blob \| history
addons/website/static/src/js/website.editor.js		diff \| blob \| history
addons/website/static/src/js/website.snippets.editor.js		diff \| blob \| history
addons/website/static/src/xml/website.snippets.xml		diff \| blob \| history
addons/website/tests/test_ui.py		diff \| blob \| history
addons/website/views/snippets.xml		diff \| blob \| history
addons/website/views/website_templates.xml		diff \| blob \| history
addons/website_blog/controllers/main.py		diff \| blob \| history
addons/website_blog/views/website_blog_templates.xml		diff \| blob \| history
addons/website_crm/__openerp__.py		diff \| blob \| history
addons/website_event/views/website_event.xml		diff \| blob \| history
addons/website_hr_recruitment/views/website_hr_recruitment.xml		diff \| blob \| history
addons/website_mail/__openerp__.py		diff \| blob \| history
addons/website_mail/controllers/__init__.py		diff \| blob \| history
addons/website_mail/controllers/email_designer.py	[deleted file]	blob \| history
addons/website_mail/models/__init__.py		diff \| blob \| history
addons/website_mail/models/email_template.py	[deleted file]	blob \| history
addons/website_mail/static/src/css/website_mail.css	[deleted file]	blob \| history
addons/website_mail/static/src/js/website_email_designer.js	[deleted file]	blob \| history
addons/website_mail/views/email_template_view.xml	[deleted file]	blob \| history
addons/website_mail/views/snippets.xml	[deleted file]	blob \| history
addons/website_mail/views/website_email_designer.xml	[deleted file]	blob \| history
addons/website_sale/controllers/main.py		diff \| blob \| history
addons/website_sale/data/website_sale_data.xml		diff \| blob \| history
addons/website_sale/data/website_sale_demo.xml		diff \| blob \| history
addons/website_sale/models/__init__.py		diff \| blob \| history
addons/website_sale/models/product_attributes.py	[new file with mode: 0644]	blob
addons/website_sale/models/product_characteristics.py	[deleted file]	blob \| history
addons/website_sale/models/res_config.py	[deleted file]	blob \| history
addons/website_sale/security/ir.model.access.csv		diff \| blob \| history
addons/website_sale/views/website_sale.xml		diff \| blob \| history
addons/website_sale/views/website_sale_backend.xml		diff \| blob \| history
addons/website_sale_delivery/controllers/main.py		diff \| blob \| history

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

RSS Atom