branch develop updated (f26bdb13 -> 14c00fcb)
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@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@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@chorem.org>.
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 61d26648ee491a16262654aad3b62d3c6d99abaa Merge: 06d78498 822205ce Author: Maven Release <maven-release@codelutin.com> Date: Tue May 15 10:10:18 2018 +0000 Merge branch 'release/3.1.4' .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(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 14c00fcb3ef33e8ce49f24dcb65ee384af7117eb Merge: f26bdb13 61d26648 Author: Maven Release <maven-release@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 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@chorem.org>.
participants (1)
-
chorem.org scm