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 a3b00921567606966a01dedb41400d2d9458a599 Merge: 77b9935 46a5188 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 9 12:33:23 2017 +0100 Merge branch 'feature/delete_ui_url_in_back_conf' into 'develop' Déplacement des urls de l'ui de la conf back vers la session de l'ui See merge request !2 .../org/chorem/pollen/rest/api/v1/PollApi.java | 10 +-- .../org/chorem/pollen/rest/api/PollApiTest.java | 3 + pollen-services/src/main/config/PollenServices.ini | 30 --------- .../org/chorem/pollen/services/PollenFixtures.java | 1 + .../chorem/pollen/services/PollenUIContext.java | 31 +++++++++ .../pollen/services/service/FixturesService.java | 2 +- .../services/service/NotificationService.java | 8 +-- .../pollen/services/service/PollService.java | 9 +-- .../services/service/PollenUIUrlRenderService.java | 74 ++++++++++---------- .../pollen/services/service/mail/EmailService.java | 78 +++++++++++----------- pollen-services/src/main/resources/fixtures.yaml | 8 +++ .../pollen/services/service/PollServiceTest.java | 13 ++-- .../service/PollenUIUrlRenderServiceTest.java | 48 +++++++------ .../services/service/VoteCountingServiceTest.java | 3 +- .../services/service/VoterListServiceTest.java | 5 +- pollen-ui-riot-js/src/main/web/js/Session.js | 5 +- 16 files changed, 177 insertions(+), 151 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.