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

author	Christophe Simonis <chs@odoo.com>
	Tue, 20 May 2014 18:19:55 +0000 (20:19 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Tue, 20 May 2014 18:19:55 +0000 (20:19 +0200)
commit	a756b823727b763310fb7d1a24c594f3d78cffe5
tree	aa1129993cf924c683df1c76d8d862b86a4f3dab	tree \| snapshot
parent	040c93026ade694e792f4b291ddc58204f8574ac	commit \| diff
parent	bb26dea60be37823a9a5b14e96ebdbde268c229e	commit \| diff

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

38 files changed:

addons/account_analytic_analysis/account_analytic_analysis.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/gamification/models/challenge.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_followers.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_mail.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/marketing_campaign/marketing_campaign.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/models.js	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/sale/report/sale_report_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale_stock/sale_stock.py	diff1 \|	diff2 \|	blob \| history
addons/survey/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/chrome.js	diff1 \|	diff2 \|	blob \| history
addons/website/controllers/main.py	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_blog/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_blog/static/src/js/website_blog.editor.js	diff1 \|	diff2 \|	blob \| history
addons/website_blog/views/website_blog_templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_crm/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_crm_partner_assign/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_customer/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_event/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_event_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_event_track/controllers/event.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/views/website_forum.xml	diff1 \|	diff2 \|	blob \| history
addons/website_hr/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_membership/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_quote/controllers/main.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_qweb.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/misc.py	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

addons/account_analytic_analysis/account_analytic_analysis.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/gamification/models/challenge.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_followers.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_mail.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/marketing_campaign/marketing_campaign.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/models.js	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/sale/report/sale_report_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale_stock/sale_stock.py	diff1 \|	diff2 \|	blob \| history
addons/survey/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/chrome.js	diff1 \|	diff2 \|	blob \| history
addons/website/controllers/main.py	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_blog/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_blog/static/src/js/website_blog.editor.js	diff1 \|	diff2 \|	blob \| history
addons/website_blog/views/website_blog_templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_crm/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_crm_partner_assign/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_customer/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_event/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_event_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_event_track/controllers/event.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/views/website_forum.xml	diff1 \|	diff2 \|	blob \| history
addons/website_hr/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_membership/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_quote/controllers/main.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_qweb.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/misc.py	diff1 \|	diff2 \|	blob \| history