Xavier Morel f4d78ae738 Merge branch 'server-trunk' ... Conflicts: addons/mass_mailing/controllers/main.py		2014-05-14 15:13:04 +02:00
..
__init__.py	[ADD] website: added support for invoking a server action through controller	2014-02-05 10:04:47 +01:00
ir_actions.py	[CLEAN] website: ir_actions: removed commented line + small reordering of columns definition + fixed an help string	2014-02-12 11:42:27 +01:00
ir_http.py	[IMP] Sitemap	2014-05-11 15:40:37 +02:00
ir_qweb.py	[REM] language passed as query param for bundles controllers	2014-04-28 14:45:13 +02:00
ir_ui_view.py	Forward-port of latest saas-4, up to revision 9416 (rev-id fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w)	2014-05-12 09:23:31 +02:00
res_config.py	[FIX] website: website settings should inherit of res.config.settings and not base.config.settings, as it create a new page settings, instead of extending one	2014-02-26 18:11:14 +01:00
test_models.py	[IMP] website tests: unicode test attributes to avoid warnings in auto_init when comparing attr values	2014-01-30 17:26:15 +01:00
website.py	[IMP] Sitemap	2014-05-11 15:40:37 +02:00