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 06d78498 Merge branch 'hotfix/3.1.3' adds f119d86c Merge tag '3.1.2' into develop adds 1f4cc31f Évite d'utiliser une API interne de flyway pour la journalisation adds 6735fffd Utilise ToPIA 3.4 en SNAPSHOT (utilise Hikari par défaut) adds 5199d462 Merge branch 'feature/use_topia_3.4' into 'develop' adds c125003f Fix build adds c60060be fixes #194 adds 7e590b78 Fixes #198 - Vote de Condorcet : Duels et non Combats adds 664769ea Merge branch 'feature/198-DuelsNotCombats' into 'develop' adds 7aaf2704 Merge branch 'develop' of gitlab.nuiton.org:chorem/pollen into develop adds 365dba8d Fixes #170 : Ajouter le mail dans le feedback adds f0fca04a expire artifacts CI adds 1b6d9bfb fix #200 : correction du binding de l'affichage de la description adds 2f08be8b fix #202 : un fois voté un invité à un sondage restreint ne peut plus voter adds 28e92bd7 fix #203 : lien vers liberapay adds a9ca3e35 correction de l'erreur à la connexion si le mail n'est pas connu adds 26b1d0ec refs #170 : correction des emails pour le feedback adds 98d61191 modification de la version de Pollen adds c5cc827e ajout du eslint dans le build du js adds fdd72af9 ajout du eslint dans le build du js adds 96b7bcde ajout du eslint dans le build du js adds 14a9cb67 ajout du eslint dans le build du js adds 2900d664 correction suite erreurs eslint adds d62ca436 MàJ du la version de l'UI à la release adds a06ad076 correction tracker piwik adds f9de2f81 modification du bouton "Nous soutenir" adds 83ae59d8 Fix typo adds 5e46d930 fixes #183 : Les colonnes "Résultats" devraient s'intituler "Score" en Borda, nombre et cumulatif - Pour nombre on utilise Total adds d38aae13 Merge branch 'feature/183-resultScore' into 'develop' adds 4e69bd02 Le créateur est un participant du vote adds 4187b8b6 Upgrade dependencies to prevent CVEs adds ebf24744 Maj de tomcat8 embed adds d18a3302 Merge branch 'feature/CVE-updates' into 'develop' adds 32be1952 ref #207 : correction de la validation des votes (entre autre la limitation des votes cumulatifs) adds 9815cc7b supression de fichier inutile adds f26bdb13 Merge branch 'master' into develop adds 822205ce release 3.1.4 success [skip ci] adds 61d26648 Merge branch 'release/3.1.4' No new revisions were added by this update. Summary of changes: .gitlab-ci.yml | 5 +- CHANGELOG | 13 ++++ pollen-persistence/pom.xml | 18 ++---- .../common/V3_1_0_5__Extract_email_addresses.java | 4 +- pollen-rest-api/pom.xml | 2 +- .../org/chorem/pollen/rest/api/v1/AuthApi.java | 2 - .../src/main/resources/log4j.properties | 2 - .../src/main/resources/pollen-rest-api.properties | 4 -- .../pollen/rest/api/AbstractPollenRestApiTest.java | 51 ++++++++------- .../org/chorem/pollen/rest/api/AuthApiTest.java | 11 ++-- .../org/chorem/pollen/rest/api/PollApiTest.java | 73 +++++++++------------- .../chorem/pollen/rest/api/PollenUserApiTest.java | 31 +++++---- .../chorem/pollen/rest/api/RestApiFixtures.java | 8 +-- .../test/resources/pollen-rest-api-test.properties | 4 -- pollen-services/pom.xml | 2 +- .../chorem/pollen/services/bean/FeedbackBean.java | 10 +++ .../services/service/VoteCountingService.java | 12 ++-- .../pollen/services/service/mail/EmailService.java | 1 + .../services/service/mail/FeedbackEmail.java | 10 +++ .../services/service/security/SecurityService.java | 4 +- .../main/resources/email/FeedbackEmail.mustache | 3 +- .../main/resources/email/FeedbackEmail_fr.mustache | 3 +- pollen-ui-riot-js/.eslintrc | 6 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-ui-riot-js/src/main/web/conf.js | 4 +- pollen-ui-riot-js/src/main/web/css/custom.css | 7 ++- pollen-ui-riot-js/src/main/web/i18n/en.json | 7 +++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 17 +++-- pollen-ui-riot-js/src/main/web/js/Logger.js | 13 +++- pollen-ui-riot-js/src/main/web/js/PageTracker.js | 38 +++++------ pollen-ui-riot-js/src/main/web/js/Pagination.js | 4 +- pollen-ui-riot-js/src/main/web/js/Poll.js | 1 + pollen-ui-riot-js/src/main/web/js/PollenBus.js | 4 +- pollen-ui-riot-js/src/main/web/js/UIHelper.js | 6 +- .../src/main/web/tag/FilterLoginProvider.tag.js | 4 +- .../src/main/web/tag/PageChanged.tag.js | 4 +- .../src/main/web/tag/PollenFooter.tag.html | 1 + .../src/main/web/tag/PollenHeader.tag.html | 30 ++++++--- .../src/main/web/tag/SignInAction.tag.js | 4 +- .../src/main/web/tag/admin/LoginProviders.tag.html | 12 ++-- .../web/tag/favoriteList/FavoriteLists.tag.html | 8 +-- .../src/main/web/tag/poll/Choice.tag.html | 3 +- .../src/main/web/tag/poll/ChoiceView.tag.html | 12 ++-- .../src/main/web/tag/poll/EditVote.tag.html | 9 +-- .../src/main/web/tag/poll/Podium.tag.html | 4 +- .../src/main/web/tag/poll/Polls.tag.html | 2 +- .../src/main/web/tag/poll/Results.tag.html | 6 +- .../src/main/web/tag/poll/Votes.tag.html | 1 + .../src/main/web/tag/poll/VotesTable.tag.html | 7 +-- .../src/main/web/tag/popup/ConfirmPopup.tag.html | 6 +- .../src/main/web/tag/popup/FeedbackModal.tag.html | 30 +++++++-- .../MajorityJudgmentConfig.tag.html | 7 ++- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- .../chorem/pollen/votecounting/VoteCounting.java | 17 ++--- pollen-votecounting-borda/pom.xml | 2 +- .../pollen/votecounting/BordaVoteCounting.java | 14 ++--- .../pollen-votecounting-borda_en_GB.properties | 2 +- .../pollen-votecounting-borda_fr_FR.properties | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- .../pollen/votecounting/CondorcetVoteCounting.java | 14 ++--- .../pollen-votecounting-condorcet_en_GB.properties | 4 +- .../pollen-votecounting-condorcet_fr_FR.properties | 4 +- pollen-votecounting-coombs/pom.xml | 2 +- .../pollen/votecounting/CoombsVoteCounting.java | 14 ++--- .../pollen-votecounting-coombs_en_GB.properties | 2 +- .../pollen-votecounting-coombs_fr_FR.properties | 2 +- pollen-votecounting-cumulative/pom.xml | 2 +- .../votecounting/CumulativeVoteCounting.java | 18 +++--- ...pollen-votecounting-cumulative_en_GB.properties | 3 +- ...pollen-votecounting-cumulative_fr_FR.properties | 3 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- .../votecounting/InstantRunoffVoteCounting.java | 14 ++--- ...en-votecounting-instant-runoff_en_GB.properties | 2 +- ...en-votecounting-instant-runoff_fr_FR.properties | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- .../votecounting/MajorityJudgmentVoteCounting.java | 15 ++--- ...votecounting-majority-judgment_en_GB.properties | 2 +- ...votecounting-majority-judgment_fr_FR.properties | 2 +- pollen-votecounting-normal/pom.xml | 2 +- .../pollen/votecounting/NormalVoteCounting.java | 12 ++-- pollen-votecounting-number/pom.xml | 2 +- .../pollen/votecounting/NumberVoteCounting.java | 12 ++-- pom.xml | 36 +++-------- todo.txt | 7 --- 86 files changed, 395 insertions(+), 362 deletions(-) delete mode 100644 todo.txt -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.