branch develop updated (d91c51ae -> f119d86c)
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 d91c51ae fix gitlab ci release adds dd3cef74 Merge branch 'release/3.1.1' into 'master' adds 9767edac release 3.1.2 success [skip ci] adds a57f38c0 fix gitlab ci release adds 047589c6 fix gitlab ci release adds 38d5e813 release 3.1.2 success [skip ci] adds dc801dd6 fix gitlab ci release adds a5ecf20b release 3.1.2 success [skip ci] new e5248ff9 Merge branch 'release/3.1.2' new f119d86c Merge tag '3.1.2' 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 f119d86cf7c756be319352623d313227850cb39c Merge: d91c51ae e5248ff9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 2 17:10:50 2018 +0000 Merge tag '3.1.2' into develop release 3.1.2 success 3.1.2 commit e5248ff9a7e75568ff311758ed32b3a48387bf87 Merge: dd3cef74 a5ecf20b Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 2 17:10:50 2018 +0000 Merge branch 'release/3.1.2' Summary of changes: .gitlab-ci.yml | 5 +++-- CHANGELOG | 15 +++++++++++++++ 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 +- 18 files changed, 34 insertions(+), 18 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 e5248ff9a7e75568ff311758ed32b3a48387bf87 Merge: dd3cef74 a5ecf20b Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 2 17:10:50 2018 +0000 Merge branch 'release/3.1.2' .gitlab-ci.yml | 18 +++++-- CHANGELOG | 15 ++++++ pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- .../pollen/services/service/VoteService.java | 2 +- pollen-ui-riot-js/package.json | 14 +++--- pollen-ui-riot-js/pom.xml | 2 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 2 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 2 +- .../src/main/web/tag/PollenFooter.tag.html | 8 +-- .../main/web/tag/components/HumanInput.tag.html | 8 +-- .../main/web/tag/components/LetterAvatar.tag.html | 8 +-- .../src/main/web/tag/poll/Choice.tag.html | 58 ++++++++++++---------- .../src/main/web/tag/poll/Votes.tag.html | 1 - pollen-ui-riot-js/webpack.config.js | 3 ++ 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 +- 27 files changed, 102 insertions(+), 67 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 f119d86cf7c756be319352623d313227850cb39c Merge: d91c51ae e5248ff9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 2 17:10:50 2018 +0000 Merge tag '3.1.2' into develop release 3.1.2 success 3.1.2 .gitlab-ci.yml | 5 +++-- CHANGELOG | 15 +++++++++++++++ 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 +- 18 files changed, 34 insertions(+), 18 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm