This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit ce12b871ed34e38ce38edde8935ecfa818d49d4c Merge: c34f932 bc8d680 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 2 14:59:28 2017 +0100 Merge branch 'feature/add_password_to_registration' into 'develop' Add password to registration See merge request !1 .../rest/api/PollenRestApiApplicationListener.java | 5 +-- .../org/chorem/pollen/rest/api/v1/AuthApi.java | 5 +-- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 5 +-- .../chorem/pollen/services/PollenUIContext.java | 29 +++++++++++++++ .../services/service/NotificationService.java | 9 ++--- .../services/service/PollenUIUrlRenderService.java | 18 +++++----- .../pollen/services/service/PollenUserService.java | 41 ++++++++-------------- .../pollen/services/service/mail/EmailService.java | 20 ++++++----- .../email/UserAccountCreatedEmail.mustache | 1 - .../email/UserAccountCreatedEmail_fr.mustache | 1 - .../service/PollenUIUrlRenderServiceTest.java | 8 +++-- .../services/service/PollenUserServiceTest.java | 19 +++++----- pollen-ui-riot-js/src/main/web/i18n.json | 16 +++++++-- pollen-ui-riot-js/src/main/web/js/AuthService.js | 4 ++- pollen-ui-riot-js/src/main/web/js/FetchService.js | 1 + pollen-ui-riot-js/src/main/web/js/Session.js | 5 +++ pollen-ui-riot-js/src/main/web/tag/SignUp.tag.html | 28 +++++++++++++-- 17 files changed, 141 insertions(+), 74 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.