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 55ff65db Merge branch 'hotfix/3.1.5' adds 14c00fcb Merge tag '3.1.4' into develop adds 4e3d5a16 Correction du ChangeLog adds 721a888f modification de la version de pollen en 3.2.0-SNAPSHOT adds b5bd7a6b Maj vers webpack 4 adds 2e1b9fd9 Maj vers webpack 4 adds 5f169b95 Maj des dépendances java adds 0af58178 refs #199 vote par ordre adds 5620de37 refs #118 modification de l'ordre de choix dans un sondage adds fae8b566 refs #172 : Envoie des mails d'invitations différé adds 453e1e77 refs #164 : Revoir la validation des votes par les méthodes de votes adds 89f78d9a refs #181 : Lors d'un vote cumulatif, le "Nombre de points à distribuer" devrait être affiché à l'utilisateur adds b393f6b3 refs #187 : Améliorer l'affichage des résultats en 'Coombs' en précisant le tour d'élimintation adds dccc39f7 refs #208 : Jugement majoritaire : ne plus modifer les mention après le premier vote adds 772268b1 refs #79 : envoie de mail chiffré adds 321a9919 refs #172 : Ajouter dans le mail de création de sondage que les invitations ne sont pas encore parti adds b0277f06 refs #199 : Il faut garder la possibilité de saisir les valeurs des choix comme sur la version 3.1.4 adds 34e324fb correction de la traduction anglaise adds ec3e92d4 correction eslint du JS adds c594bd23 Merge tag '3.1.5' into develop adds 70121878 refs #192 : Restreindre un sondage sur les emails des votants adds eb65c638 refs #173 : Validation des emails sans token en base adds 0b2a29da refs #173 : correction des tests adds 8bba608d refs #209 : Ajout de la liste d'emargement pour les sondage restreints adds a763c63d si la premision du sondage change, mettre cette nouvelle permission dans l'url adds 863519e0 Toujours voir son vote pour pouvoir l'édité adds 73fefcf4 Correction d'un cas d'égalité pour le dépouillement du jugement majoritaire adds aa3fef8e ajout des entête de fichier adds dbae6ade release 3.2.0 success [skip ci] adds 2da77615 Merge branch 'release/3.2.0' No new revisions were added by this update. Summary of changes: CHANGELOG | 29 +- docs/config.md | 2 +- pollen-persistence/pom.xml | 2 +- .../pollen/persistence/entity/ChoiceTopiaDao.java | 7 +- .../pollen/persistence/entity/PollTopiaDao.java | 7 +- .../entity/PollenUserEmailAddressTopiaDao.java | 11 - .../pollen/persistence/entity/PollenUserImpl.java | 2 +- .../chorem/pollen/persistence/entity/Polls.java | 4 + .../entity/VoterListMemberTopiaDao.java | 20 + .../migration/h2/V3_2_0_1__add_invivation_sent.sql | 3 + .../h2/V3_2_0_2__add_PGP_public_key_in_email.sql | 2 + .../V3_2_0_3__add_parcicipants_Filters_in_poll.sql | 2 + .../h2/V3_2_0_4__use_JWT_for_validate_email.sql | 19 + .../postgresql/V3_2_0_1__add_invivation_sent.sql | 3 + .../V3_2_0_2__add_PGP_public_key_in_email.sql | 2 + .../V3_2_0_3__add_parcicipants_Filters_in_poll.sql | 2 + .../V3_2_0_4__use_JWT_for_validate_email.sql | 19 + pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 30672 -> 30935 bytes pollen-rest-api/pom.xml | 9 +- .../rest/api/PollenRestApiRequestFilter.java | 4 +- .../org/chorem/pollen/rest/api/v1/AuthApi.java | 6 +- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 18 + .../chorem/pollen/rest/api/v1/VoterListApi.java | 47 +- .../pollen/rest/api/AbstractPollenRestApiTest.java | 2 + pollen-services/pom.xml | 17 +- pollen-services/src/main/config/PollenServices.ini | 2 +- .../services/DefaultPollenServiceContext.java | 52 +-- .../org/chorem/pollen/services/bean/PollBean.java | 31 ++ .../services/bean/PollenUserEmailAddressBean.java | 10 + .../pollen/services/bean/VoteCountingTypeBean.java | 21 - .../pollen/services/bean/VoterListMemberBean.java | 20 + .../services/config/PollenServicesConfig.java | 13 +- .../pollen/services/service/ChoiceService.java | 5 +- .../pollen/services/service/CommentService.java | 16 - .../pollen/services/service/CryptoService.java | 241 +++++++++++ .../chorem/pollen/services/service/ErrorMap.java | 5 + .../pollen/services/service/FixturesService.java | 1 + .../services/service/NotificationService.java | 32 +- .../pollen/services/service/PollService.java | 23 + .../services/service/PollenServiceSupport.java | 22 + .../pollen/services/service/PollenUserService.java | 72 +++- .../services/service/VoteCountingService.java | 52 +-- .../services/service/VoteCountingTypeService.java | 2 - .../pollen/services/service/VoteService.java | 37 +- .../pollen/services/service/VoterListService.java | 148 ++++++- .../pollen/services/service/mail/EmailService.java | 24 +- .../services/service/mail/PollCreatedEmail.java | 5 + .../service/security/PollenPermissions.java | 4 + .../services/service/security/SecurityService.java | 85 +++- .../main/resources/email/PollCreatedEmail.mustache | 4 + .../resources/email/PollCreatedEmail_fr.mustache | 6 +- .../i18n/pollen-services_en_GB.properties | 4 +- .../i18n/pollen-services_fr_FR.properties | 4 +- pollen-ui-riot-js/.eslintrc | 3 + pollen-ui-riot-js/package.json | 40 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-ui-riot-js/src/main/js/riotjs-loader.js | 61 --- pollen-ui-riot-js/src/main/web/css/blaze.css | 2 +- pollen-ui-riot-js/src/main/web/css/custom.css | 2 + pollen-ui-riot-js/src/main/web/css/main.css | 18 + pollen-ui-riot-js/src/main/web/i18n/en.json | 66 ++- pollen-ui-riot-js/src/main/web/i18n/fr.json | 60 ++- pollen-ui-riot-js/src/main/web/index.js | 18 +- pollen-ui-riot-js/src/main/web/js/AuthService.js | 10 +- pollen-ui-riot-js/src/main/web/js/Choice.js | 2 +- pollen-ui-riot-js/src/main/web/js/ChoiceService.js | 6 +- .../src/main/web/js/CommentService.js | 6 +- .../src/main/web/js/ConfigurationService.js | 6 +- .../src/main/web/js/FavoriteListService.js | 6 +- .../src/main/web/js/FeedbackService.js | 6 +- pollen-ui-riot-js/src/main/web/js/FetchService.js | 7 +- pollen-ui-riot-js/src/main/web/js/I18nHelper.js | 10 +- pollen-ui-riot-js/src/main/web/js/Logger.js | 2 +- pollen-ui-riot-js/src/main/web/js/Message.js | 4 +- pollen-ui-riot-js/src/main/web/js/PageTracker.js | 4 +- pollen-ui-riot-js/src/main/web/js/Pagination.js | 2 +- pollen-ui-riot-js/src/main/web/js/Poll.js | 45 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 67 +-- pollen-ui-riot-js/src/main/web/js/PollService.js | 24 +- pollen-ui-riot-js/src/main/web/js/PollenBus.js | 5 +- .../src/main/web/js/ResourceService.js | 7 +- pollen-ui-riot-js/src/main/web/js/ResultService.js | 6 +- pollen-ui-riot-js/src/main/web/js/Session.js | 31 +- pollen-ui-riot-js/src/main/web/js/Singleton.js | 2 +- pollen-ui-riot-js/src/main/web/js/UIHelper.js | 13 +- pollen-ui-riot-js/src/main/web/js/UserService.js | 17 +- .../src/main/web/js/VoteCountingTypeService.js | 6 +- pollen-ui-riot-js/src/main/web/js/VoteService.js | 6 +- .../src/main/web/js/VoterListService.js | 33 +- .../src/main/web/tag/Authorization.tag.html | 9 +- .../src/main/web/tag/ContentLoader.tag.html | 21 +- .../src/main/web/tag/FilterLoginProvider.tag.js | 8 +- .../src/main/web/tag/HeaderI18n.tag.html | 2 +- .../src/main/web/tag/PageChanged.tag.js | 2 +- .../src/main/web/tag/Pagination.tag.html | 11 +- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 89 ++-- .../src/main/web/tag/PollenFooter.tag.html | 21 +- .../src/main/web/tag/PollenHeader.tag.html | 46 +- .../src/main/web/tag/PollenMessageManager.tag.html | 9 +- .../src/main/web/tag/PollenWaiter.tag.html | 7 +- .../src/main/web/tag/Privacy.tag.html | 5 +- pollen-ui-riot-js/src/main/web/tag/QrCode.tag.html | 9 +- .../src/main/web/tag/SignCheck.tag.html | 21 +- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 29 +- .../src/main/web/tag/SignInAction.tag.js | 5 +- pollen-ui-riot-js/src/main/web/tag/SignUp.tag.html | 50 +-- .../src/main/web/tag/UserProfile.tag.html | 131 +++--- .../src/main/web/tag/admin/GtuCard.tag.html | 18 +- .../src/main/web/tag/admin/Gtus.tag.html | 20 +- .../src/main/web/tag/admin/LoginProviders.tag.html | 32 +- .../src/main/web/tag/admin/UserCard.tag.html | 28 +- .../src/main/web/tag/admin/UserEditModal.tag.html | 32 +- .../src/main/web/tag/admin/Users.tag.html | 16 +- .../src/main/web/tag/components/Avatar.tag.html | 13 +- .../src/main/web/tag/components/Card.tag.html | 6 +- .../src/main/web/tag/components/Checkbox.tag.html | 9 +- .../src/main/web/tag/components/Draggable.tag.html | 153 +++++++ .../main/web/tag/components/GtuValidation.tag.html | 14 +- .../web/tag/components/MultiLineLabel.tag.html | 6 +- .../src/main/web/tag/components/Search.tag.html | 10 +- .../tag/components/UserEmailAddressList.tag.html | 189 ++++++-- .../main/web/tag/components/date-picker.tag.html | 14 +- .../web/tag/components/date-time-picker.tag.html | 10 +- .../main/web/tag/components/time-picker.tag.html | 9 +- .../web/tag/favoriteList/ChildListCard.tag.html | 15 +- .../tag/favoriteList/ChildListEditModal.tag.html | 23 +- .../web/tag/favoriteList/FavoriteList.tag.html | 32 +- .../web/tag/favoriteList/FavoriteListCard.tag.html | 15 +- .../favoriteList/FavoriteListEditModal.tag.html | 19 +- .../web/tag/favoriteList/FavoriteLists.tag.html | 32 +- .../web/tag/favoriteList/ImportCsvModal.tag.html | 20 +- .../web/tag/favoriteList/ImportLdapModal.tag.html | 22 +- .../main/web/tag/favoriteList/MemberCard.tag.html | 15 +- .../web/tag/favoriteList/MemberEditModal.tag.html | 25 +- .../src/main/web/tag/poll/CheckEmails.tag.html | 16 +- .../src/main/web/tag/poll/Choice.tag.html | 33 +- .../src/main/web/tag/poll/ChoiceView.tag.html | 74 +--- .../src/main/web/tag/poll/Choices.tag.html | 204 +++++++-- .../src/main/web/tag/poll/Comments.tag.html | 63 +-- .../src/main/web/tag/poll/Description.tag.html | 28 +- .../src/main/web/tag/poll/EditPoll.tag.html | 40 +- .../src/main/web/tag/poll/EditVote.tag.html | 195 +++++---- .../src/main/web/tag/poll/EditVoteOrder.tag.html | 480 +++++++++++++++++++++ .../src/main/web/tag/poll/Participants.tag.html | 171 ++++++++ .../src/main/web/tag/poll/Podium.tag.html | 95 ---- .../src/main/web/tag/poll/Poll.tag.html | 86 ++-- .../src/main/web/tag/poll/PollCard.tag.html | 19 +- .../src/main/web/tag/poll/Polls.tag.html | 26 +- .../src/main/web/tag/poll/Report.tag.html | 128 +----- .../src/main/web/tag/poll/Results.tag.html | 48 ++- .../src/main/web/tag/poll/Settings.tag.html | 284 +++++++----- .../src/main/web/tag/poll/Summary.tag.html | 140 ++++-- .../src/main/web/tag/poll/Votes.tag.html | 102 ++++- .../src/main/web/tag/poll/VotesTable.tag.html | 30 +- .../src/main/web/tag/popup/AddReportModal.tag.html | 102 +++++ .../main/web/tag/popup/ChoiceDetailModal.tag.html | 84 ++++ .../src/main/web/tag/popup/ConfirmPopup.tag.html | 7 +- .../src/main/web/tag/popup/FeedbackModal.tag.html | 37 +- .../src/main/web/tag/popup/GtuChangeModal.tag.html | 10 +- .../main/web/tag/popup/InformationPopup.tag.html | 4 +- .../src/main/web/tag/popup/Modal.tag.html | 8 +- .../src/main/web/tag/popup/NewPassword.tag.html | 12 +- .../src/main/web/tag/popup/QrCodeButton.tag.html | 2 +- .../main/web/tag/popup/ResendValidation.tag.html | 12 +- .../main/web/tag/popup/ShowReportsModal.tag.html | 98 +++++ .../web/tag/voteCountingType/BordaConfig.tag.html | 12 +- .../voteCountingType/BordaDetailResult.tag.html | 22 +- .../CondorcetDetailResult.tag.html | 20 +- .../voteCountingType/CoombsDetailResult.tag.html | 24 +- .../tag/voteCountingType/CumulativeConfig.tag.html | 4 +- .../InstantRunoffDetailResult.tag.html | 20 +- .../MajorityJudgmentConfig.tag.html | 17 +- .../MajorityJudgmentDetailResult.tag.html | 18 +- .../MaxChoicesNumberConfig.tag.html | 11 +- .../tag/voterList/ImportFavoritListModal.tag.html | 14 +- .../src/main/web/tag/voterList/VoterList.tag.html | 43 +- .../main/web/tag/voterList/VoterListCard.tag.html | 23 +- .../web/tag/voterList/VoterListEditModal.tag.html | 22 +- .../web/tag/voterList/VoterListMemberCard.tag.html | 17 +- .../voterList/VoterListMemberEditModal.tag.html | 24 +- pollen-ui-riot-js/webpack.config.js | 39 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- .../pollen/votecounting/AbstractVoteCounting.java | 23 + .../AbstractVoteCountingMaxChoice.java | 56 +++ .../votecounting/AbstractVoteCountingStrategy.java | 24 +- .../chorem/pollen/votecounting/VoteCounting.java | 77 +--- .../pollen/votecounting/model/ChoiceScore.java | 10 - .../votecounting/model/VoteCountingResult.java | 2 +- .../pollen/votecounting/model/VoteForChoice.java | 4 + .../i18n/pollen-votecounting-api_en_GB.properties | 1 + .../i18n/pollen-votecounting-api_fr_FR.properties | 1 + pollen-votecounting-borda/pom.xml | 2 +- .../pollen/votecounting/BordaVoteCounting.java | 53 +-- .../pollen-votecounting-borda_en_GB.properties | 2 +- .../pollen-votecounting-borda_fr_FR.properties | 2 +- .../BordaVoteCountingStrategyTest.java | 184 ++++---- pollen-votecounting-condorcet/pom.xml | 2 +- .../pollen/votecounting/CondorcetVoteCounting.java | 59 +-- .../pollen-votecounting-condorcet_en_GB.properties | 3 +- .../pollen-votecounting-condorcet_fr_FR.properties | 3 +- .../CondorcetVoteCountingStrategyTest.java | 212 ++++----- pollen-votecounting-coombs/pom.xml | 2 +- .../pollen/votecounting/CoombsVoteCounting.java | 60 +-- .../votecounting/CoombsVoteCountingStrategy.java | 179 ++++---- .../pollen-votecounting-coombs_en_GB.properties | 3 +- .../pollen-votecounting-coombs_fr_FR.properties | 3 +- .../CoombsVoteCountingStrategyTest.java | 210 ++++----- pollen-votecounting-cumulative/pom.xml | 2 +- .../votecounting/CumulativeVoteCounting.java | 73 ++-- ...pollen-votecounting-cumulative_en_GB.properties | 5 +- ...pollen-votecounting-cumulative_fr_FR.properties | 5 +- .../CumulativeVoteCountingStrategyTest.java | 148 +++---- pollen-votecounting-instant-runoff/pom.xml | 2 +- .../votecounting/InstantRunoffVoteCounting.java | 60 +-- .../InstantRunoffVoteCountingStrategy.java | 155 ++++--- ...en-votecounting-instant-runoff_en_GB.properties | 3 +- ...en-votecounting-instant-runoff_fr_FR.properties | 3 +- .../InstantRunoffVoteCountingStrategyTest.java | 184 ++++---- pollen-votecounting-majority-judgment/pom.xml | 2 +- .../votecounting/MajorityJudgmentVoteCounting.java | 59 +-- .../MajorityJudgmentVoteCountingStrategy.java | 4 +- ...votecounting-majority-judgment_en_GB.properties | 3 +- ...votecounting-majority-judgment_fr_FR.properties | 3 +- .../MajorityJudgmentVoteCountingStrategyTest.java | 112 ++--- pollen-votecounting-normal/pom.xml | 2 +- .../pollen/votecounting/NormalVoteCounting.java | 52 +-- .../votecounting/NormalVoteCountingStrategy.java | 9 +- .../NormalVoteCountingStrategyTest.java | 144 +++---- pollen-votecounting-number/pom.xml | 2 +- .../pollen/votecounting/NumberVoteCounting.java | 52 +-- .../NumberVoteCountingStrategyTest.java | 144 +++---- pom.xml | 200 +++------ 234 files changed, 5209 insertions(+), 3427 deletions(-) create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_2_0_1__add_invivation_sent.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_2_0_2__add_PGP_public_key_in_email.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_2_0_3__add_parcicipants_Filters_in_poll.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_2_0_4__use_JWT_for_validate_email.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_2_0_1__add_invivation_sent.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_2_0_2__add_PGP_public_key_in_email.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_2_0_3__add_parcicipants_Filters_in_poll.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_2_0_4__use_JWT_for_validate_email.sql create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/CryptoService.java delete mode 100644 pollen-ui-riot-js/src/main/js/riotjs-loader.js create mode 100644 pollen-ui-riot-js/src/main/web/tag/components/Draggable.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Participants.tag.html delete mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Podium.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/popup/AddReportModal.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/popup/ChoiceDetailModal.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/popup/ShowReportsModal.tag.html create mode 100644 pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingMaxChoice.java -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.