stable
Clone or download
Read-only
Merge commit 'refs/changes/60/4260/21' of ssh://gerrit.tuleap.net:29418/tuleap into HEAD
* ssh://gerrit.tuleap.net:29418/tuleap: story #8248 Have a beautiful register confirmation email Change-Id: I3f150f4891f71a3bd41303d61449b839a12498e8
Modified Files
| Name | ||||
|---|---|---|---|---|
| M | site-content/en_US/account/account.tab | +7 | −1 | Go to diff View file |
| M | site-content/en_US/admin/new_account_email.txt | +1 | −2 | Go to diff View file |
| M | site-content/en_US/en_US.tab | +1 | −1 | Go to diff View file |
| M | site-content/fr_FR/account/account.tab | +7 | −1 | Go to diff View file |
| M | site-content/fr_FR/admin/new_account_email.txt | +2 | −3 | Go to diff View file |
| M | site-content/fr_FR/fr_FR.tab | +1 | −1 | Go to diff View file |
| M | src/common/account/ConfirmationPresenter.class.php | +5 | −9 | Go to diff View file |
| M | src/common/autoload.php | +6 | −2 | Go to diff View file |
| A | src/common/mail/MailNotificationPresenter.class.php | +47 | −0 | Go to diff View file |
| A | src/common/mail/MailOutlinePresenter.class.php | +46 | −0 | Go to diff View file |
| M | src/common/mail/MailPresenterFactory.class.php | +67 | −7 | Go to diff View file |
| A | src/common/mail/MailRegisterByAdminApprovalPresenter.class.php | +43 | −0 | Go to diff View file |
| A | src/common/mail/MailRegisterByAdminNotificationPresenter.class.php | +48 | −0 | Go to diff View file |
| M | src/common/mail/MailRegisterPresenter.class.php | +2 | −13 | Go to diff View file |
| M | src/common/mail/TuleapRegisterMail.class.php | +27 | −4 | Go to diff View file |
| M | src/common/user/PendingUserNotifier.php | +6 | −22 | Go to diff View file |
| M | src/templates/account/confirmation.mustache | +3 | −8 | Go to diff View file |
| A | src/templates/mail/mail-admin-approval.mustache | +205 | −0 | Go to diff View file |
| A | src/templates/mail/mail-notification.mustache | +202 | −0 | Go to diff View file |
| M | src/www/account/pending-resend.php | +3 | −3 | Go to diff View file |
| M | src/www/account/register.php | +20 | −22 | Go to diff View file |
| M | src/www/admin/approve_pending_users.php | +13 | −18 | Go to diff View file |
| M | src/www/include/proj_email.php | +26 | −4 | Go to diff View file |