This is an automated email from the git hooks/post-receive script. New change to branch master in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 5989d7d9 Merge branch 'hotfix/3.0.1' adds b04aa221 modification de la version de pollen => 3.0.2 adds bee58e82 A jout du fuseau horaire en configuration dans le formatage des dates pour les courriels adds c04bb083 correction de l'import CSV d'une liste de votants ( ref #159) + correction du chargement de la page adds aae34ef7 mise à jour du change log adds d49640ee Merge branch 'hotfix/3.0.2' No new revisions were added by this update. Summary of changes: CHANGELOG | 3 + pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-services/src/main/config/PollenServices.ini | 8 ++- .../chorem/pollen/services/PollenUIContext.java | 10 +++ .../services/config/PollenServicesConfig.java | 5 ++ .../service/FavoriteListImportFromFile.java | 26 ++++---- .../services/service/mail/AbstractReportEmail.java | 5 +- .../service/mail/AbstractReportForAdminEmail.java | 5 +- .../services/service/mail/AbstractVoteEmail.java | 5 +- .../services/service/mail/ChoiceAddedEmail.java | 5 +- .../services/service/mail/ChoiceDeletedEmail.java | 5 +- .../services/service/mail/ChoiceEditedEmail.java | 5 +- .../services/service/mail/ChoiceReportEmail.java | 5 +- .../service/mail/ChoiceReportForAdminEmail.java | 5 +- .../services/service/mail/CommentAddedEmail.java | 5 +- .../services/service/mail/CommentDeletedEmail.java | 5 +- .../services/service/mail/CommentEditedEmail.java | 5 +- .../services/service/mail/CommentReportEmail.java | 5 +- .../service/mail/CommentReportForAdminEmail.java | 5 +- .../pollen/services/service/mail/EmailService.java | 76 ++++++++++++---------- .../services/service/mail/FeedbackEmail.java | 5 +- .../services/service/mail/LostPasswordEmail.java | 5 +- .../service/mail/PollChoicePeriodEndedEmail.java | 5 +- .../service/mail/PollChoicePeriodStartedEmail.java | 5 +- .../services/service/mail/PollClosedEmail.java | 5 +- .../services/service/mail/PollCreatedEmail.java | 5 +- .../service/mail/PollEndReminderEmail.java | 5 +- .../services/service/mail/PollInvitationEmail.java | 5 +- .../services/service/mail/PollReportEmail.java | 5 +- .../service/mail/PollReportForAdminEmail.java | 5 +- .../service/mail/PollVotePeriodEndedEmail.java | 5 +- .../service/mail/PollVotePeriodStartedEmail.java | 5 +- .../service/mail/PollVoteReminderEmail.java | 5 +- .../pollen/services/service/mail/PollenMail.java | 11 +++- .../service/mail/ResendValidationEmail.java | 5 +- .../mail/RestrictedPollInvitationEmail.java | 5 +- .../service/mail/UserAccountCreatedEmail.java | 5 +- .../mail/UserAccountCreatedFromProviderEmail.java | 5 +- .../service/mail/UserAccountDeletedEmail.java | 5 +- .../service/mail/UserAccountEditedEmail.java | 5 +- .../mail/UserAccountEmailValidatedEmail.java | 5 +- .../mail/UserAccountPasswordChangedEmail.java | 5 +- .../services/service/mail/VoteAddedEmail.java | 5 +- .../services/service/mail/VoteDeletedEmail.java | 5 +- .../services/service/mail/VoteEditedEmail.java | 5 +- .../i18n/pollen-services_en_GB.properties | 1 + .../i18n/pollen-services_fr_FR.properties | 1 + pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 2 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 2 +- .../web/tag/favoriteList/FavoriteList.tag.html | 40 +++++------- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 64 files changed, 234 insertions(+), 166 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.