- Pollen-commits - mailman.cloud.codelutin.com

branch develop updated (6bc52ca9 -> 952dd455)
by chorem.org scm Oct. 19, 2017

Oct. 19, 2017

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 6bc52ca9 Corrige une dépendance déclarée en doublon new 952dd455 Corrige le scope d'une dépendance The 1 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 952dd4556d42364921e527fb0f6510a8e7cd6292 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Oct 19 11:16:04 2017 +0200 Corrige le scope d'une dépendance Summary of changes: pollen-rest-api/pom.xml | 1 - 1 file changed, 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch develop updated (b5e83c33 -> 6bc52ca9)
by chorem.org scm Oct. 19, 2017

Oct. 19, 2017

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 b5e83c33 desactivé le bouton "enregistrer" pendant la création du sondage coté serveur (ref #162) new 6bc52ca9 Corrige une dépendance déclarée en doublon The 1 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 6bc52ca93696db7ae69486f7edc88f809578d8e1 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Oct 19 11:07:24 2017 +0200 Corrige une dépendance déclarée en doublon Summary of changes: pollen-rest-api/pom.xml | 5 ----- 1 file changed, 5 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (be707f0b -> b5e83c33)
by chorem.org scm Oct. 18, 2017

Oct. 18, 2017

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 be707f0b Merge tag '3.0.2' into develop new b5e83c33 desactivé le bouton "enregistrer" pendant la création du sondage coté serveur (ref #162) The 1 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 b5e83c3363a127ad5910c092caeaae6d20d9c3f0 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Oct 18 17:54:56 2017 +0200 desactivé le bouton "enregistrer" pendant la création du sondage coté serveur (ref #162) Summary of changes: pollen-ui-riot-js/src/main/web/tag/poll/EditPoll.tag.html | 4 ++++ 1 file changed, 4 insertions(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch master updated (5989d7d9 -> d49640ee)
by chorem.org scm Oct. 18, 2017

Oct. 18, 2017

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(a)chorem.org>.

1 0

branch develop updated (41b49632 -> be707f0b)
by chorem.org scm Oct. 18, 2017

Oct. 18, 2017

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(a)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(a)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(a)chorem.org>.

1 2

annotated tag 3.0.2 created (now 711cd2b4)
by chorem.org scm Oct. 18, 2017

Oct. 18, 2017

This is an automated email from the git hooks/post-receive script. New change to annotated tag 3.0.2 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 711cd2b4 (tag) tagging d49640ee56bfd8865b69476cbbcf89e64978d851 (commit) replaces 3.0.1 tagged by Sylvain Bavencoff on Wed Oct 18 16:07:57 2017 +0200 - Log ----------------------------------------------------------------- Pollen 3.0.2 ----------------------------------------------------------------------- This annotated tag includes the following new commits: new d49640ee Merge branch 'hotfix/3.0.2' The 1 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 d49640ee56bfd8865b69476cbbcf89e64978d851 Merge: 5989d7d9 aae34ef7 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Oct 18 16:07:52 2017 +0200 Merge branch 'hotfix/3.0.2' -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch hotfix/3.0.2 deleted (was aae34ef7)
by chorem.org scm Oct. 18, 2017

Oct. 18, 2017

This is an automated email from the git hooks/post-receive script. New change to branch hotfix/3.0.2 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git was aae34ef7 mise à jour du change log The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch hotfix/3.0.2 updated (c04bb083 -> aae34ef7)
by chorem.org scm Oct. 18, 2017

Oct. 18, 2017

This is an automated email from the git hooks/post-receive script. New change to branch hotfix/3.0.2 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from c04bb083 correction de l'import CSV d'une liste de votants ( ref #159) + correction du chargement de la page new aae34ef7 mise à jour du change log The 1 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 aae34ef74f2fb61595653e3d92691642b3f3dfca Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Oct 18 16:07:07 2017 +0200 mise à jour du change log Summary of changes: CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch hotfix/3.0.2 updated (bee58e82 -> c04bb083)
by chorem.org scm Oct. 18, 2017

Oct. 18, 2017

This is an automated email from the git hooks/post-receive script. New change to branch hotfix/3.0.2 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from bee58e82 A jout du fuseau horaire en configuration dans le formatage des dates pour les courriels new c04bb083 correction de l'import CSV d'une liste de votants ( ref #159) + correction du chargement de la page The 1 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 c04bb083026ac59f52b05a0446f22af00723394c Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Oct 18 15:45:00 2017 +0200 correction de l'import CSV d'une liste de votants ( ref #159) + correction du chargement de la page Summary of changes: .../service/FavoriteListImportFromFile.java | 26 +++++++------- .../web/tag/favoriteList/FavoriteList.tag.html | 40 +++++++++------------- 2 files changed, 30 insertions(+), 36 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch hotfix/3.0.2 updated (b04aa221 -> bee58e82)
by chorem.org scm Oct. 18, 2017

Oct. 18, 2017

This is an automated email from the git hooks/post-receive script. New change to branch hotfix/3.0.2 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from b04aa221 modification de la version de pollen => 3.0.2 new bee58e82 A jout du fuseau horaire en configuration dans le formatage des dates pour les courriels The 1 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 bee58e828b6308f1c44be0fb1b379ff8b910da95 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Oct 18 12:04:33 2017 +0200 A jout du fuseau horaire en configuration dans le formatage des dates pour les courriels Summary of changes: pollen-services/src/main/config/PollenServices.ini | 8 ++- .../chorem/pollen/services/PollenUIContext.java | 10 +++ .../services/config/PollenServicesConfig.java | 5 ++ .../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 + 44 files changed, 184 insertions(+), 113 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1