stable

Clone or download

Read-only

Merge commit 'refs/changes/33/4233/23' of ssh://gerrit.tuleap.net:29418/tuleap into HEAD

* ssh://gerrit.tuleap.net:29418/tuleap: story #7892 Have a beautiful register feedback Conflicts: src/common/autoload.php Change-Id: I146b0f3701197621a35f180c0d849c7cac53d79d

Modified Files

Name
M site-content/en_US/account/account.tab +6 −6 Go to diff View file
M site-content/en_US/admin/new_account_email.txt +21 −0 Go to diff View file
M site-content/fr_FR/account/account.tab +6 −6 Go to diff View file
M site-content/fr_FR/account/new_account_email.txt +2 −2 Go to diff View file
M site-content/fr_FR/admin/new_account_email.txt +21 −0 Go to diff View file
M site-content/fr_FR/include/new_user_email.txt +2 −2 Go to diff View file
M src/common/account/ConfirmationPresenter.class.php +24 −2 Go to diff View file
M src/common/autoload.php +4 −2 Go to diff View file
A src/common/mail/MailPresenterFactory.class.php +136 −0 Go to diff View file
A src/common/mail/TuleapRegisterMail.class.php +63 −0 Go to diff View file
M src/templates/account/confirmation.mustache +27 −4 Go to diff View file
M src/templates/mail/mail-admin.mustache +31 −29 Go to diff View file
M src/www/account/pending-resend.php +1 −1 Go to diff View file
M src/www/account/register.php +36 −11 Go to diff View file
M src/www/admin/approve_pending_users.php +1 −1 Go to diff View file
M src/www/include/proj_email.php +13 −70 Go to diff View file
M src/www/themes/FlamingParrot/css/utils/account-confirmation.less +9 −1 Go to diff View file
M src/www/themes/common/css/utils/account-confirmation.less +159 −25 Go to diff View file
M src/www/themes/common/css/utils/utils.less +1 −1 Go to diff View file
A src/www/themes/common/images/email.svg +39 −0 Go to diff View file