Fabien Meghazi 90814d781a [MERGE] upstream ...

bzr revid: fme@openerp.com-20131030144813-xmjb6i9ayv23aqyi

2013-10-30 15:48:13 +01:00

..

__init__.py

[FIX] broken merge hidden by leftover pyc file

2013-10-14 14:13:19 +02:00

ir_qweb.py

[IMP] remove /website/attachment, make attachments go through /website/image

2013-10-24 12:34:01 +02:00

ir_rule.py

[IMP] website: ir.rule: add the http secure session in the eval context for access rules evaluation.

2013-10-10 11:02:29 +02:00

ir_ui_view.py

[BRK] Disable automatic t-href on ir.ui.view#save() that breaks most of the snippets

2013-10-30 09:54:25 +01:00

test_models.py

[FIX] move conversion code from ir.fields.converter into website.qweb structures

2013-10-09 15:31:12 +02:00

website.py

[MERGE] upstream

2013-10-30 15:48:13 +01:00