stable

Clone or download

Read-only

Merge commit 'refs/changes/45/4245/9' of ssh://gerrit.tuleap.net:29418/tuleap into stable

* ssh://gerrit.tuleap.net:29418/tuleap: story #8248: Embed image of the confirmation mail

Modified Files

Name
M src/common/autoload.php +3 −2 Go to diff View file
M src/common/mail/Codendi_Mail.class.php +12 −2 Go to diff View file
A src/common/mail/LogoRetriever.class.php +54 −0 Go to diff View file
M src/common/mail/MailNotificationPresenter.class.php +1 −2 Go to diff View file
M src/common/mail/MailOutlinePresenter.class.php +0 −3 Go to diff View file
M src/common/mail/MailPresenterFactory.class.php +10 −36 Go to diff View file
M src/common/mail/MailProjectNotificationMustBeApprovedPresenter.class.php +0 −2 Go to diff View file
M src/common/mail/MailProjectNotificationPresenter.class.php +0 −2 Go to diff View file
M src/common/mail/MailProjectOneStepRegisterPresenter.class.php +1 −3 Go to diff View file
M src/common/mail/MailRegisterByAdminApprovalPresenter.class.php +1 −2 Go to diff View file
M src/common/mail/MailRegisterByAdminNotificationPresenter.class.php +1 −2 Go to diff View file
M src/common/mail/MailRegisterByAdminPresenter.class.php +1 −2 Go to diff View file
M src/common/mail/MailRegisterByUserPresenter.class.php +1 −2 Go to diff View file
M src/common/mail/MailRegisterPresenter.class.php +1 −2 Go to diff View file
M src/common/mail/TuleapRegisterMail.class.php +29 −6 Go to diff View file
M src/templates/mail/mail-admin-approval.mustache +2 −2 Go to diff View file
M src/templates/mail/mail-admin.mustache +2 −2 Go to diff View file
M src/templates/mail/mail-notification.mustache +2 −2 Go to diff View file
M src/templates/mail/mail-project-register.mustache +2 −2 Go to diff View file
M src/templates/mail/mail.mustache +2 −2 Go to diff View file
M src/www/account/register.php +8 −7 Go to diff View file
M src/www/themes/FlamingParrot/images/organization_logo.png Binary file Go to diff View file
M tests/simpletest/common/mail/Codendi_MailTest.php +14 −7 Go to diff View file
A tests/simpletest/common/mail/LogoRetrieverTest.php +47 −0 Go to diff View file