Thibault Delavallée fe2ea997a2 [MERGE] Sync with trunk. ...

bzr revid: tde@openerp.com-20130411103645-rmr3sa8p9ropx2gc

2013-04-11 12:36:45 +02:00

..

i18n

Launchpad automatic translations update.

2013-04-02 05:48:17 +00:00

security

[IMP] email.template: review/adapt form to 7.0-style + continue refactoring polishing

2012-09-01 03:09:07 +02:00

static/src/img

[IMP] mail, email_template: chatter: added forgotton images for links/buttons, cleaned a bit the CSS for the composer.

2012-07-18 15:32:34 +02:00

tests

[IMP] mail: tests: updated tests for attachments

2013-03-07 12:06:57 +01:00

wizard

[FIX] Fixed forgotten conflict when merging trunk.

2013-03-14 09:53:15 +01:00

__init__.py

…

__openerp__.py

[IMP] Portal, now auto_install (also all of its dependencies)

2012-12-12 12:22:37 +01:00

email_template_view.xml

[IMP] email_template: from and subject are not required anymore, because they can have now defautl values using chatter.

2013-03-07 17:50:45 +01:00

email_template.py

[MERGE] Sync with 7.0

2013-03-14 09:25:35 +01:00

html2text.py

[FIX] a few problems introduced with the last merge

2012-10-02 13:12:31 +02:00

res_partner_demo.yml

…

res_partner_view.xml

[CLEAN] crm, res_partner: added name on added filters; added oline breaks in big help of notification_email_send.

2013-03-13 13:51:24 +01:00

res_partner.py

[IMP] email_template, crm: added forgotten filters for opt-out; cleaned help of opt-out; email body is back into internal note as it has been decided that it was too much change for 7.0, especially that email content parsing is not robust enough.

2013-03-13 12:20:13 +01:00