Commit Graph
4 Commits
Author SHA1 Message Date
Olivier Dony b0bed63351 [IMP] mail.thread: renaming methods to avoid collisions with objects that use the mixin
bzr revid: odo@openerp.com-20110823175809-hw81fkptg90702vh
2011-08-23 19:58:09 +02:00
Olivier Dony 50507512cb [MERGE] latest trunk
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.

bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
2011-08-10 01:44:28 +02:00
Olivier Dony c996efa2fe [IMP] mail: another pass of cleanup/refactoring of mail features - finish renaming
bzr revid: odo@openerp.com-20110722163457-7g9ngdb2p0bixcst
2011-07-22 18:34:57 +02:00
Rifakat Haradwala (Open ERP) 47a85e9f8f [IMP] mail: rename module email to mail because of parsing error
bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
2011-04-04 15:15:52 +05:30