Merge lp://qastaging/~pexego/poweremail/nan_poweremail_improvements into lp://qastaging/~nan-tic/poweremail/nan_poweremail
Proposed by
Omar (Pexego)
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~pexego/poweremail/nan_poweremail_improvements |
| Merge into: | lp://qastaging/~nan-tic/poweremail/nan_poweremail |
| Diff against target: |
76 lines (+17/-2) (has conflicts) 5 files modified
i18n/es_ES.po (+5/-0) i18n/poweremail.pot (+5/-0) poweremail_core.py (+1/-1) poweremail_scheduler_data.xml (+2/-1) poweremail_template.py (+4/-0) Text conflict in poweremail_template.py |
| To merge this branch: | bzr merge lp://qastaging/~pexego/poweremail/nan_poweremail_improvements |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Albert Cervera i Areny - http://www.NaN-tic.com | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch adds a return receipt field in mail configuration enabling this functionality and it fixes sending mail from any action, it failed in silent obtaining the lang field, if you have placeholder for this field
To post a comment you must log in.
Unmerged revisions
- 218. By Omar (Pexego)
-
[FIX] Bug #581854 Encode to utf-8 email user and email password to avoid this issue
- 217. By Omar (Pexego)
-
[FIX] Allows to create act_windows for poweremail templates with non ascii name
- 216. By Omar (Pexego)
-
[MERGE]
- 215. By Omar (Pexego)
-
[FIX] Removes repeated definition of numbercall field in cron record
- 214. By Omar (Pexego)
-
Adds translation of new field return_receipt in .pot and es_ES.po
- 213. By Omar (Pexego)
-
[IMP] Adds return receipt field in mail configuration enabling this functionality. [FIX] sending mail from any action, it fails in silent obtaining the lang field if you have placeholder for this field
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
