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 cbd6646f143d8b7fe69f6e25ff810d09c6957e8c Merge: e930cbc 299c0b8 Author: Kevin Morin <morin@codelutin.com> Date: Tue May 9 11:44:42 2017 +0200 fixes #23 Manage the notifications .../pollen/persistence/entity/PollTopiaDao.java | 14 ++++ .../pollen/persistence/entity/VoteTopiaDao.java | 12 +++ pollen-persistence/src/main/xmi/pollen.zargo | Bin 23790 -> 24937 bytes pollen-rest-api/pom.xml | 5 ++ .../rest/api/PollenRestApiApplicationListener.java | 86 +++++++++++++++++++++ .../src/main/resources/pollen-rest-api.properties | 3 + pollen-services/pom.xml | 5 ++ pollen-services/src/main/config/PollenServices.ini | 25 +++++- .../org/chorem/pollen/services/bean/PollBean.java | 37 +++++++++ .../org/chorem/pollen/services/bean/VoteBean.java | 1 - .../services/config/PollenServicesConfig.java | 6 ++ .../pollen/services/job/AbstractPollenJob.java | 18 +++++ .../services/job/SendPollEndReminderJob.java | 64 +++++++++++++++ .../pollen/services/job/SendVoteSummariesJob.java | 71 +++++++++++++++++ .../services/service/NotificationService.java | 51 +++++++++++- .../pollen/services/service/PollService.java | 38 +++++++-- .../pollen/services/service/VoteService.java | 11 ++- .../services/service/mail/AbstractVoteEmail.java | 72 +++++++++++++++++ .../pollen/services/service/mail/EmailService.java | 30 ++++++- ...teAddedEmail.java => PollEndReminderEmail.java} | 26 +++---- .../services/service/mail/VoteAddedEmail.java | 12 +-- .../services/service/mail/VoteDeletedEmail.java | 12 +-- .../services/service/mail/VoteEditedEmail.java | 15 +--- ...VoteDeletedEmail.java => VoteSummaryEmail.java} | 43 ++++++----- .../resources/email/PollEndReminderEmail.mustache | 3 + .../email/PollEndReminderEmail_fr.mustache | 3 + .../main/resources/email/VoteAddedEmail.mustache | 18 +++++ .../resources/email/VoteAddedEmail_fr.mustache | 18 +++++ .../main/resources/email/VoteDeletedEmail.mustache | 18 +++++ .../resources/email/VoteDeletedEmail_fr.mustache | 18 +++++ .../main/resources/email/VoteEditedEmail.mustache | 18 +++++ .../resources/email/VoteEditedEmail_fr.mustache | 18 +++++ .../main/resources/email/VoteSummaryEmail.mustache | 26 +++++++ .../resources/email/VoteSummaryEmail_fr.mustache | 26 +++++++ .../i18n/pollen-services_en_GB.properties | 10 ++- .../i18n/pollen-services_fr_FR.properties | 10 ++- pollen-ui-riot-js/src/main/web/i18n.json | 20 ++++- .../src/main/web/tag/poll/Settings.tag.html | 78 ++++++++++++++++++- .../pollen/votecounting/NormalVoteCounting.java | 2 +- .../votecounting/PercentageVoteCounting.java | 2 +- pom.xml | 13 +++- 41 files changed, 858 insertions(+), 100 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.