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 72c9e9221b7ac86a2514c667956f04aa99efa742 Merge: 27d7d511 cd9a848f Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 29 10:51:20 2019 +0100 Merge branch 'feature/april' into develop .../pollen/persistence/entity/ChoiceTopiaDao.java | 4 +- .../pollen/persistence/entity/CommentTopiaDao.java | 7 + .../pollen/persistence/entity/PollTopiaDao.java | 43 +++- .../chorem/pollen/persistence/entity/Polls.java | 22 +- .../persistence/entity/QuestionTopiaDao.java | 14 ++ .../pollen/persistence/entity/VoteTopiaDao.java | 14 +- .../migration/h2/V3_3_0_1__add_question_table.sql | 104 ++++++++ .../postgresql/V3_3_0_1__add_question_table.sql | 107 +++++++++ pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 30935 -> 31242 bytes .../pollen/rest/api/beans/PollCreateBean.java | 11 - .../org/chorem/pollen/rest/api/v1/ChoiceApi.java | 65 ++--- .../org/chorem/pollen/rest/api/v1/CommentApi.java | 97 ++++++++ .../org/chorem/pollen/rest/api/v1/PollApi.java | 36 +-- .../org/chorem/pollen/rest/api/v1/ReportApi.java | 114 +++++++++ .../org/chorem/pollen/rest/api/v1/VoteApi.java | 29 ++- .../chorem/pollen/rest/api/v1/VoteCountingApi.java | 15 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 24 +- .../org/chorem/pollen/services/PollenFixtures.java | 2 + .../org/chorem/pollen/services/bean/PollBean.java | 124 ++-------- .../chorem/pollen/services/bean/QuestionBean.java | 224 +++++++++++++++++ .../pollen/services/service/ChoiceService.java | 95 ++++---- .../pollen/services/service/CommentService.java | 235 +++++++++++++++++- .../pollen/services/service/FeedService.java | 34 ++- .../pollen/services/service/FixturesService.java | 12 +- .../services/service/NotificationService.java | 153 ++++++++---- .../pollen/services/service/PollService.java | 166 +++++-------- .../services/service/PollenServiceSupport.java | 30 +-- .../pollen/services/service/QuestionService.java | 267 +++++++++++++++++++++ .../pollen/services/service/ReportService.java | 188 ++++++++++++++- .../services/service/VoteCountingService.java | 83 +++---- .../pollen/services/service/VoteService.java | 166 ++++++++----- .../pollen/services/service/VoterListService.java | 13 +- .../pollen/services/service/mail/EmailService.java | 60 ++++- .../services/service/mail/PollInvitationEmail.java | 18 +- .../mail/RestrictedPollInvitationEmail.java | 16 +- .../service/security/PollenPermissions.java | 47 +++- .../services/service/security/SecurityService.java | 118 ++++++--- pollen-services/src/main/resources/fixtures.yaml | 62 ++--- .../i18n/pollen-services_en_GB.properties | 1 + .../i18n/pollen-services_fr_FR.properties | 1 + .../pollen/services/service/PollServiceTest.java | 74 ++++-- .../services/service/VoteCountingServiceTest.java | 30 ++- .../services/service/VoterListServiceTest.java | 14 +- pollen-ui-riot-js/src/main/web/js/ChoiceService.js | 33 ++- pollen-ui-riot-js/src/main/web/js/Poll.js | 163 ++++++------- pollen-ui-riot-js/src/main/web/js/PollForm.js | 147 ++++++------ pollen-ui-riot-js/src/main/web/js/PollService.js | 38 ++- pollen-ui-riot-js/src/main/web/js/ResultService.js | 8 +- pollen-ui-riot-js/src/main/web/js/VoteService.js | 24 +- .../src/main/web/tag/components/Draggable.tag.html | 8 +- .../src/main/web/tag/components/LazyLoad.tag.html | 2 +- .../src/main/web/tag/poll/Choices.tag.html | 8 +- .../src/main/web/tag/poll/EditVote.tag.html | 117 +++++---- .../src/main/web/tag/poll/EditVoteOrder.tag.html | 12 +- .../src/main/web/tag/poll/Poll.tag.html | 24 +- .../src/main/web/tag/poll/PollCard.tag.html | 4 +- .../src/main/web/tag/poll/Results.tag.html | 49 ++-- .../src/main/web/tag/poll/Settings.tag.html | 4 +- .../src/main/web/tag/poll/Summary.tag.html | 2 +- .../src/main/web/tag/poll/Votes.tag.html | 8 +- .../src/main/web/tag/poll/VotesTable.tag.html | 4 +- .../voteCountingType/BordaDetailResult.tag.html | 16 +- .../CondorcetDetailResult.tag.html | 12 +- .../voteCountingType/CoombsDetailResult.tag.html | 8 +- .../InstantRunoffDetailResult.tag.html | 6 +- .../MajorityJudgmentDetailResult.tag.html | 14 +- 67 files changed, 2585 insertions(+), 1067 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.