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

branch develop updated (0af58178 -> 5620de37)
by chorem.org scm May 22, 2018

May 22, 2018

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 0af58178 refs #199 vote par ordre new 5620de37 refs #118 modification de l'ordre de choix dans un sondage 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 5620de37cd0a4f554c1593b1238af930bb463b45 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue May 22 16:22:17 2018 +0200 refs #118 modification de l'ordre de choix dans un sondage Summary of changes: .../pollen/persistence/entity/ChoiceTopiaDao.java | 7 +- .../pollen/services/service/ChoiceService.java | 5 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 7 +- .../src/main/web/tag/components/Draggable.tag.html | 29 +++- .../src/main/web/tag/poll/Choice.tag.html | 2 + .../src/main/web/tag/poll/Choices.tag.html | 192 +++++++++++++++++---- .../src/main/web/tag/poll/EditPoll.tag.html | 2 +- 7 files changed, 190 insertions(+), 54 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 (5f169b95 -> 0af58178)
by chorem.org scm May 17, 2018

May 17, 2018

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 5f169b95 Maj des dépendances java new 0af58178 refs #199 vote par ordre 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 0af581788866b2f91b47327822d130f48c8cb42e Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu May 17 16:34:54 2018 +0200 refs #199 vote par ordre Summary of changes: pollen-ui-riot-js/src/main/web/css/custom.css | 2 + pollen-ui-riot-js/src/main/web/css/main.css | 12 + pollen-ui-riot-js/src/main/web/i18n/en.json | 3 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 3 + pollen-ui-riot-js/src/main/web/js/Poll.js | 4 + pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 14 + .../src/main/web/tag/components/Draggable.tag.html | 132 ++++++ .../web/tag/components/MultiLineLabel.tag.html | 6 +- .../src/main/web/tag/poll/ChoiceView.tag.html | 61 +-- .../src/main/web/tag/poll/EditVoteOrder.tag.html | 505 +++++++++++++++++++++ .../src/main/web/tag/poll/Report.tag.html | 112 +---- .../src/main/web/tag/poll/Votes.tag.html | 13 +- .../src/main/web/tag/poll/VotesTable.tag.html | 2 +- .../src/main/web/tag/popup/AddReportModal.tag.html | 102 +++++ .../main/web/tag/popup/ChoiceDetailModal.tag.html | 84 ++++ .../main/web/tag/popup/ShowReportsModal.tag.html | 98 ++++ 16 files changed, 980 insertions(+), 173 deletions(-) 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/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 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (2e1b9fd9 -> 5f169b95)
by chorem.org scm May 16, 2018

May 16, 2018

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 2e1b9fd9 Maj vers webpack 4 new 5f169b95 Maj des dépendances java 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 5f169b9539792fbaa8cc94983bb663ea34c282d6 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed May 16 17:51:53 2018 +0200 Maj des dépendances java Summary of changes: pollen-rest-api/pom.xml | 7 +- .../org/chorem/pollen/rest/api/v1/AuthApi.java | 6 +- .../pollen/rest/api/AbstractPollenRestApiTest.java | 2 + pollen-services/pom.xml | 7 +- .../services/DefaultPollenServiceContext.java | 52 +++--- .../services/config/PollenServicesConfig.java | 5 +- pom.xml | 179 ++++----------------- 7 files changed, 59 insertions(+), 199 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 (b5bd7a6b -> 2e1b9fd9)
by chorem.org scm May 16, 2018

May 16, 2018

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 b5bd7a6b Maj vers webpack 4 new 2e1b9fd9 Maj vers webpack 4 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 2e1b9fd94a721154d6ffe7594c8abaf13ebf1742 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed May 16 14:06:04 2018 +0200 Maj vers webpack 4 Summary of changes: pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 52 +++++++++++----------- 1 file changed, 26 insertions(+), 26 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 (721a888f -> b5bd7a6b)
by chorem.org scm May 16, 2018

May 16, 2018

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 721a888f modification de la version de pollen en 3.2.0-SNAPSHOT new b5bd7a6b Maj vers webpack 4 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 b5bd7a6b6ce48f8323bc569a3a79e391ac9400a9 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed May 16 14:01:16 2018 +0200 Maj vers webpack 4 Summary of changes: pollen-ui-riot-js/.eslintrc | 3 + pollen-ui-riot-js/package.json | 38 +++--- 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/index.js | 18 ++- pollen-ui-riot-js/src/main/web/js/AuthService.js | 6 +- 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 | 35 +++--- pollen-ui-riot-js/src/main/web/js/PollForm.js | 27 ++-- pollen-ui-riot-js/src/main/web/js/PollService.js | 6 +- 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 | 23 ++-- 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 | 6 +- .../src/main/web/js/VoteCountingTypeService.js | 6 +- pollen-ui-riot-js/src/main/web/js/VoteService.js | 6 +- .../src/main/web/js/VoterListService.js | 10 +- .../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 | 9 +- .../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 | 123 ++++++++++--------- .../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 | 7 +- .../main/web/tag/components/GtuValidation.tag.html | 14 ++- .../src/main/web/tag/components/Search.tag.html | 10 +- .../tag/components/UserEmailAddressList.tag.html | 27 ++-- .../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 | 31 ++--- .../src/main/web/tag/poll/ChoiceView.tag.html | 13 +- .../src/main/web/tag/poll/Choices.tag.html | 14 ++- .../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 | 38 +++--- .../src/main/web/tag/poll/EditVote.tag.html | 44 +++---- .../src/main/web/tag/poll/Podium.tag.html | 95 -------------- .../src/main/web/tag/poll/Poll.tag.html | 75 ++++++------ .../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 | 16 +-- .../src/main/web/tag/poll/Results.tag.html | 42 ++++--- .../src/main/web/tag/poll/Settings.tag.html | 136 +++++++++++---------- .../src/main/web/tag/poll/Summary.tag.html | 58 ++++----- .../src/main/web/tag/poll/Votes.tag.html | 40 +++--- .../src/main/web/tag/poll/VotesTable.tag.html | 23 ++-- .../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 +- .../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 | 13 +- .../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 +++--- 116 files changed, 1169 insertions(+), 1228 deletions(-) delete mode 100644 pollen-ui-riot-js/src/main/js/riotjs-loader.js delete mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Podium.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (4e3d5a16 -> 721a888f)
by chorem.org scm May 15, 2018

May 15, 2018

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 4e3d5a16 Correction du ChangeLog new 721a888f modification de la version de pollen en 3.2.0-SNAPSHOT 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 721a888f51f0c163ea357b9bfdeec17f206c6366 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue May 15 15:40:08 2018 +0200 modification de la version de pollen en 3.2.0-SNAPSHOT Summary of changes: pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- 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-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 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 (14c00fcb -> 4e3d5a16)
by chorem.org scm May 15, 2018

May 15, 2018

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 14c00fcb Merge tag '3.1.4' into develop new 4e3d5a16 Correction du ChangeLog 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 4e3d5a165156e7cea31e01061dc86d35242f0289 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue May 15 15:24:33 2018 +0200 Correction du ChangeLog Summary of changes: CHANGELOG | 14 ++++---------- 1 file changed, 4 insertions(+), 10 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 (f26bdb13 -> 14c00fcb)
by chorem.org scm May 15, 2018

May 15, 2018

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 f26bdb13 Merge branch 'master' into develop adds 822205ce release 3.1.4 success [skip ci] new 61d26648 Merge branch 'release/3.1.4' new 14c00fcb Merge tag '3.1.4' 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 14c00fcb3ef33e8ce49f24dcb65ee384af7117eb Merge: f26bdb13 61d26648 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue May 15 10:10:18 2018 +0000 Merge tag '3.1.4' into develop release 3.1.4 success 3.1.4 commit 61d26648ee491a16262654aad3b62d3c6d99abaa Merge: 06d78498 822205ce Author: Maven Release <maven-release(a)codelutin.com> Date: Tue May 15 10:10:18 2018 +0000 Merge branch 'release/3.1.4' Summary of changes: CHANGELOG | 13 +++++++++++++ pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- 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-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 29 insertions(+), 16 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.1.4 created (now 1333f871)
by chorem.org scm May 15, 2018

May 15, 2018

This is an automated email from the git hooks/post-receive script. New change to annotated tag 3.1.4 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 1333f871 (tag) tagging 61d26648ee491a16262654aad3b62d3c6d99abaa (commit) replaces 3.1.3 tagged by Maven Release on Tue May 15 10:10:18 2018 +0000 - Log ----------------------------------------------------------------- release 3.1.4 success 3.1.4 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch master updated (06d78498 -> 61d26648)
by chorem.org scm May 15, 2018

May 15, 2018

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

1 0