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 7d81ee5c8381f07ad5260e967e40a4548e04a561 Merge: 98760a78 b2935cf1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 26 12:06:18 2020 +0000 Merge branch 'release/3.3.0' .gitlab-ci.yml | 106 +- CHANGELOG | 18 + README.md | 27 +- docs/faq.md | 199 +- docs/install.md | 2 +- mkdocs.yml | 7 +- package-lock.json | 3 + pollen-persistence/pom.xml | 2 +- .../common/V3_1_0_5__Extract_email_addresses.java | 10 +- .../src/main/java/javax/annotation/Generated.java | 106 + .../persistence/PollenFlywayServiceImpl.java | 13 +- .../pollen/persistence/entity/ChoiceTopiaDao.java | 4 +- .../pollen/persistence/entity/CommentTopiaDao.java | 7 + .../pollen/persistence/entity/PollTopiaDao.java | 43 +- .../chorem/pollen/persistence/entity/Polls.java | 22 +- ...{CommentTopiaDao.java => QuestionTopiaDao.java} | 16 +- .../pollen/persistence/entity/VoteTopiaDao.java | 33 +- .../migration/h2/V3_3_0_1__add_question_table.sql | 104 + .../postgresql/V3_3_0_1__add_question_table.sql | 107 + pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 30935 -> 31242 bytes pollen-rest-api/README.md | 15 - pollen-rest-api/pom.xml | 2 +- .../pollen/rest/api/beans/PollCreateBean.java | 11 - .../pollen/rest/api/beans/VoterListSaveBean.java | 11 + .../converter/VoteCountingConfigDeserializer.java | 25 +- .../org/chorem/pollen/rest/api/v1/ChoiceApi.java | 65 +- .../org/chorem/pollen/rest/api/v1/CommentApi.java | 97 + .../org/chorem/pollen/rest/api/v1/PollApi.java | 36 +- .../org/chorem/pollen/rest/api/v1/ReportApi.java | 135 + .../org/chorem/pollen/rest/api/v1/VoteApi.java | 29 +- .../chorem/pollen/rest/api/v1/VoteCountingApi.java | 15 +- .../chorem/pollen/rest/api/v1/VoterListApi.java | 6 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 24 +- .../test/resources/pollen-rest-api-test.properties | 1 - pollen-services/pom.xml | 19 +- .../org/chorem/pollen/services/PollenFixtures.java | 2 + .../services/bean/PaginationParameterBean.java | 12 +- .../org/chorem/pollen/services/bean/PollBean.java | 123 +- .../chorem/pollen/services/bean/QuestionBean.java | 245 + .../services/bean/export/FavoriteListsExport.java | 2 +- .../services/config/PollenServicesConfig.java | 18 + .../pollen/services/service/ChoiceService.java | 129 +- .../pollen/services/service/CommentService.java | 235 +- .../pollen/services/service/CryptoService.java | 74 +- .../services/service/FavoriteListService.java | 4 +- .../pollen/services/service/FeedService.java | 34 +- .../pollen/services/service/FixturesService.java | 12 +- .../services/service/NotificationService.java | 153 +- .../pollen/services/service/PollService.java | 170 +- .../services/service/PollenServiceSupport.java | 30 +- .../pollen/services/service/QuestionService.java | 267 + .../pollen/services/service/ReportService.java | 188 +- .../pollen/services/service/SocialAuthService.java | 43 +- .../services/service/VoteCountingService.java | 83 +- .../pollen/services/service/VoteService.java | 174 +- .../pollen/services/service/VoterListService.java | 113 +- .../pollen/services/service/mail/EmailService.java | 63 +- .../services/service/mail/PollInvitationEmail.java | 18 +- .../mail/RestrictedPollInvitationEmail.java | 16 +- .../service/security/PollenPermissions.java | 47 +- .../services/service/security/SecurityService.java | 145 +- pollen-services/src/main/resources/fixtures.yaml | 62 +- .../i18n/pollen-services_en_GB.properties | 1 + .../i18n/pollen-services_fr_FR.properties | 1 + .../services/service/FavoriteListServiceTest.java | 2 +- .../pollen/services/service/PollServiceTest.java | 74 +- .../services/service/VoteCountingServiceTest.java | 30 +- .../pollen/services/service/VoteServiceTest.java | 30 +- .../services/service/VoterListServiceTest.java | 16 +- .../src/test/resources/pollen-services.properties | 1 - pollen-ui-riot-js/package-lock.json | 8076 ++++++++++++++++++++ pollen-ui-riot-js/package.json | 31 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-ui-riot-js/src/main/web/css/blaze.css | 3 + pollen-ui-riot-js/src/main/web/css/main.css | 19 +- pollen-ui-riot-js/src/main/web/css/print.css | 40 +- .../src/main/web/customData/home-en.html | 2 +- .../src/main/web/customData/home-fr.html | 4 +- pollen-ui-riot-js/src/main/web/homeCL/en.html | 2 +- pollen-ui-riot-js/src/main/web/homeCL/fr.html | 2 +- pollen-ui-riot-js/src/main/web/homeCL/offers.html | 6 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 9 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 10 +- pollen-ui-riot-js/src/main/web/js/ChoiceService.js | 33 +- pollen-ui-riot-js/src/main/web/js/Poll.js | 163 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 171 +- pollen-ui-riot-js/src/main/web/js/PollService.js | 42 +- pollen-ui-riot-js/src/main/web/js/ResultService.js | 8 +- pollen-ui-riot-js/src/main/web/js/Session.js | 3 +- pollen-ui-riot-js/src/main/web/js/VoteService.js | 24 +- .../src/main/web/js/VoterListService.js | 4 +- .../src/main/web/tag/HeaderI18n.tag.html | 6 +- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 2 +- .../src/main/web/tag/PollenFooter.tag.html | 34 +- .../src/main/web/tag/PollenHeader.tag.html | 8 +- .../src/main/web/tag/Privacy.tag.html | 3 +- .../src/main/web/tag/SignCheck.tag.html | 4 +- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 6 +- pollen-ui-riot-js/src/main/web/tag/SignUp.tag.html | 2 +- .../src/main/web/tag/UserProfile.tag.html | 24 +- .../src/main/web/tag/admin/GtuCard.tag.html | 6 +- .../src/main/web/tag/admin/Gtus.tag.html | 2 +- .../src/main/web/tag/admin/LoginProviders.tag.html | 20 +- .../src/main/web/tag/admin/UserCard.tag.html | 6 +- .../src/main/web/tag/admin/UserEditModal.tag.html | 2 +- .../src/main/web/tag/components/Avatar.tag.html | 3 +- .../src/main/web/tag/components/Card.tag.html | 4 +- .../web/tag/components/ContextualMenu.tag.html | 2 +- .../src/main/web/tag/components/Draggable.tag.html | 8 +- .../src/main/web/tag/components/LazyLoad.tag.html | 2 +- .../main/web/tag/components/LetterAvatar.tag.html | 4 +- .../main/web/tag/components/LoadingCard.tag.html | 2 +- .../web/tag/components/MultiLineLabel.tag.html | 8 +- .../src/main/web/tag/components/Search.tag.html | 4 +- .../tag/components/UserEmailAddressList.tag.html | 6 +- .../main/web/tag/components/date-picker.tag.html | 2 +- .../web/tag/components/date-time-picker.tag.html | 2 +- .../main/web/tag/components/time-picker.tag.html | 2 +- .../web/tag/favoriteList/ChildListCard.tag.html | 4 +- .../web/tag/favoriteList/FavoriteListCard.tag.html | 4 +- .../web/tag/favoriteList/FavoriteLists.tag.html | 2 +- .../src/main/web/tag/poll/CheckEmails.tag.html | 2 +- .../src/main/web/tag/poll/Choice.tag.html | 35 +- .../src/main/web/tag/poll/ChoiceView.tag.html | 2 +- .../src/main/web/tag/poll/Choices.tag.html | 28 +- .../src/main/web/tag/poll/Comments.tag.html | 32 +- .../src/main/web/tag/poll/Description.tag.html | 10 +- .../src/main/web/tag/poll/EditPoll.tag.html | 10 +- .../src/main/web/tag/poll/EditVote.tag.html | 198 +- .../src/main/web/tag/poll/EditVoteOrder.tag.html | 49 +- .../src/main/web/tag/poll/Participants.tag.html | 10 +- .../src/main/web/tag/poll/Poll.tag.html | 75 +- .../src/main/web/tag/poll/PollCard.tag.html | 8 +- .../src/main/web/tag/poll/Polls.tag.html | 2 +- .../src/main/web/tag/poll/Report.tag.html | 2 +- .../src/main/web/tag/poll/Results.tag.html | 55 +- .../src/main/web/tag/poll/Settings.tag.html | 100 +- .../src/main/web/tag/poll/Summary.tag.html | 6 +- .../src/main/web/tag/poll/Votes.tag.html | 21 +- .../src/main/web/tag/poll/VotesTable.tag.html | 20 +- .../main/web/tag/popup/ChoiceDetailModal.tag.html | 5 +- .../src/main/web/tag/popup/NewPassword.tag.html | 2 +- .../main/web/tag/popup/ResendValidation.tag.html | 2 +- .../web/tag/voteCountingType/BordaConfig.tag.html | 136 +- .../voteCountingType/BordaDetailResult.tag.html | 22 +- .../CondorcetDetailResult.tag.html | 12 +- .../voteCountingType/CoombsDetailResult.tag.html | 8 +- .../InstantRunoffDetailResult.tag.html | 6 +- .../MajorityJudgmentDetailResult.tag.html | 14 +- .../MaxChoicesNumberConfig.tag.html | 32 +- .../main/web/tag/voterList/VoterListCard.tag.html | 6 +- .../web/tag/voterList/VoterListMemberCard.tag.html | 2 +- pollen-ui-riot-js/webpack.config.js | 16 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- ....java => AbstractVoteCountingMinMaxChoice.java} | 19 +- .../votecounting/AbstractVoteCountingStrategy.java | 8 +- ...rConfig.java => MinMaxChoicesNumberConfig.java} | 11 +- .../i18n/pollen-votecounting-api_en_GB.properties | 1 + .../i18n/pollen-votecounting-api_fr_FR.properties | 3 +- pollen-votecounting-borda/pom.xml | 2 +- .../chorem/pollen/votecounting/BordaConfig.java | 4 +- .../pollen/votecounting/BordaVoteCounting.java | 6 +- .../BordaVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- .../pollen/votecounting/CondorcetVoteCounting.java | 4 +- .../CondorcetVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- .../pollen/votecounting/CoombsVoteCounting.java | 4 +- .../CoombsVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- pollen-votecounting-cumulative/pom.xml | 2 +- .../votecounting/CumulativeVoteCounting.java | 4 +- .../CumulativeVoteCountingStrategy.java | 2 +- .../CumulativeVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- .../votecounting/InstantRunoffVoteCounting.java | 4 +- .../InstantRunoffVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- .../votecounting/MajorityJudgmentVoteCounting.java | 4 +- .../MajorityJudgmentVoteCountingStrategyTest.java | 7 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- pollen-votecounting-normal/pom.xml | 2 +- .../pollen/votecounting/NormalVoteCounting.java | 10 +- .../votecounting/NormalVoteCountingStrategy.java | 4 +- .../NormalVoteCountingStrategyTest.java | 6 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- pollen-votecounting-number/pom.xml | 2 +- .../pollen/votecounting/NumberVoteCounting.java | 10 +- .../votecounting/NumberVoteCountingStrategy.java | 4 +- .../NumberVoteCountingStrategyTest.java | 6 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- pom.xml | 82 +- 198 files changed, 12163 insertions(+), 1791 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.