This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 41b49632 Merge tag '3.0.1' into develop 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' new d8d09435 Merge tag '3.0.2' into develop new be707f0b Merge tag '3.0.2' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit be707f0bb226784441c8df269568235ee6540b8a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 18 16:29:37 2017 +0200 Merge tag '3.0.2' into develop Pollen 3.0.2 # Conflicts: # pollen-persistence/pom.xml # pollen-rest-api/pom.xml # pollen-services/pom.xml # pollen-services/src/main/config/PollenServices.ini # pollen-services/src/main/java/org/chorem/pollen/services/PollenUIContext.java # pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServicesConfig.java # pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java # pollen-ui-riot-js/package.json # pollen-ui-riot-js/pom.xml # pollen-ui-riot-js/src/main/web/i18n/en.json # pollen-ui-riot-js/src/main/web/i18n/fr.json # pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteList.tag.html # pollen-votecounting-aggregator/pom.xml # pollen-votecounting-api/pom.xml # pollen-votecounting-borda/pom.xml # pollen-votecounting-condorcet/pom.xml # pollen-votecounting-coombs/pom.xml # pollen-votecounting-cumulative/pom.xml # pollen-votecounting-instant-runoff/pom.xml # pollen-votecounting-normal/pom.xml # pollen-votecounting-number/pom.xml # pom.xml commit d8d09435002174c66da77edf19d1176c8d207dc2 Merge: 41b49632 d49640ee Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 18 16:29:06 2017 +0200 Merge tag '3.0.2' into develop Pollen 3.0.2 # Conflicts: # pollen-persistence/pom.xml # pollen-rest-api/pom.xml # pollen-services/pom.xml # pollen-services/src/main/config/PollenServices.ini # pollen-services/src/main/java/org/chorem/pollen/services/PollenUIContext.java # pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServicesConfig.java # pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java # pollen-ui-riot-js/package.json # pollen-ui-riot-js/pom.xml # pollen-ui-riot-js/src/main/web/i18n/en.json # pollen-ui-riot-js/src/main/web/i18n/fr.json # pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteList.tag.html # pollen-votecounting-aggregator/pom.xml # pollen-votecounting-api/pom.xml # pollen-votecounting-borda/pom.xml # pollen-votecounting-condorcet/pom.xml # pollen-votecounting-coombs/pom.xml # pollen-votecounting-cumulative/pom.xml # pollen-votecounting-instant-runoff/pom.xml # pollen-votecounting-normal/pom.xml # pollen-votecounting-number/pom.xml # pom.xml Summary of changes: CHANGELOG | 3 + pollen-services/src/main/config/PollenServices.ini | 6 ++ .../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 | 80 ++++++++++++---------- .../service/mail/ExceedingMaxVotersEmail.java | 5 +- .../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/UserAccountEmailAddressAddedEmail.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 + .../web/tag/favoriteList/FavoriteList.tag.html | 32 ++++----- 49 files changed, 221 insertions(+), 149 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.