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 a95ebe26519fb82777015dc69f0bb88cdaf0d7d5 Merge: e1da9a13 53961ca9 Author: dcosse <cosse@codelutin.com> Date: Wed Oct 30 11:20:44 2019 +0100 Merge branch 'feature/bug-on-save' into develop .gitlab-ci.yml | 23 + package-lock.json | 3 + .../pollen/rest/api/beans/VoterListSaveBean.java | 11 + .../chorem/pollen/rest/api/v1/VoterListApi.java | 6 +- .../org/chorem/pollen/services/bean/PollBean.java | 3 +- .../pollen/services/service/ChoiceService.java | 36 +- .../pollen/services/service/QuestionService.java | 33 +- .../pollen/services/service/VoterListService.java | 96 +- .../services/service/VoterListServiceTest.java | 2 + pollen-ui-riot-js/package-lock.json | 8018 ++++++++++++++++++++ pollen-ui-riot-js/package.json | 12 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 36 +- pollen-ui-riot-js/src/main/web/js/PollService.js | 2 +- .../src/main/web/js/VoterListService.js | 4 +- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 2 +- .../src/main/web/tag/poll/CheckEmails.tag.html | 2 +- .../src/main/web/tag/poll/Choice.tag.html | 25 +- .../src/main/web/tag/poll/Choices.tag.html | 19 +- .../src/main/web/tag/poll/Comments.tag.html | 2 +- .../src/main/web/tag/poll/Description.tag.html | 2 +- .../src/main/web/tag/poll/EditPoll.tag.html | 10 +- .../src/main/web/tag/poll/EditVote.tag.html | 2 +- .../src/main/web/tag/poll/EditVoteOrder.tag.html | 2 +- .../src/main/web/tag/poll/Report.tag.html | 2 +- .../src/main/web/tag/poll/Results.tag.html | 2 +- .../src/main/web/tag/poll/Settings.tag.html | 40 +- .../src/main/web/tag/poll/Summary.tag.html | 2 +- .../src/main/web/tag/poll/Votes.tag.html | 2 +- .../src/main/web/tag/poll/VotesTable.tag.html | 2 +- pollen-ui-riot-js/webpack.config.js | 2 +- 30 files changed, 8252 insertions(+), 151 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.