This is an automated email from the git hooks/post-receive script. New change to branch feature/1_socialauth in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 6ad03011 refs #1 gestion des tiers de connexion + style du login new c04a57ed refs #1 erreur si l'utilisateur veut se connecter via un service tiers et que son email est deja utilisé par un autre compte Pollen The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c04a57ed346b619226b41e2a5b204fe3544e8add Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 29 17:57:01 2017 +0200 refs #1 erreur si l'utilisateur veut se connecter via un service tiers et que son email est deja utilisé par un autre compte Pollen Summary of changes: .../pollen/rest/api/PollenRestApiApplication.java | 2 ++ .../PollenEmailAlreadyUsedExceptionMapper.java | 20 ++++++++++++++ .../pollen/services/service/SocialAuthService.java | 4 +++ .../security/PollenEmailAlreadyUsedException.java | 11 ++++++++ pollen-ui-riot-js/src/main/web/i18n.json | 2 ++ pollen-ui-riot-js/src/main/web/img/logo.png | Bin 0 -> 10506 bytes pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 18 +++++++++++-- .../src/main/web/tag/PollenMessageManager.tag.html | 2 ++ .../src/main/web/tag/admin/LoginProviders.tag.html | 30 ++++++++++----------- 9 files changed, 71 insertions(+), 18 deletions(-) create mode 100644 pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/exceptionMappers/PollenEmailAlreadyUsedExceptionMapper.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenEmailAlreadyUsedException.java create mode 100644 pollen-ui-riot-js/src/main/web/img/logo.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.