This is an automated email from the git hooks/post-receive script. New commit to branch master in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit dd3cef74a9fa09a5ea15f36a7b66e0ad2b9c0022 Merge: 80045391 d2dbd2ce Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Jan 8 17:14:26 2018 +0100 Merge branch 'release/3.1.1' into 'master' release/3.1.1 See merge request chorem/pollen!13 .gitlab-ci.yml | 13 +-- CHANGELOG | 11 +++ docs/config.md | 2 +- docs/css/material-custom.css | 32 ++++++++ docs/electionMethods.md | 2 +- docs/faq.md | 63 +++++++++++++++ docs/font/Pacifico.ttf | Bin 0 -> 75568 bytes docs/index.md | 62 +++++++------- docs/install.md | 8 ++ docs/socialauth.md | 2 +- mkdocs.yml | 7 +- pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- .../services/service/PollenResourceService.java | 6 +- .../services/service/security/SecurityService.java | 7 +- .../i18n/pollen-services_fr_FR.properties | 2 +- pollen-ui-riot-js/package.json | 5 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-ui-riot-js/src/main/web/css/main.css | 90 ++++++++++++++++++++- pollen-ui-riot-js/src/main/web/i18n/en.json | 16 ++-- pollen-ui-riot-js/src/main/web/i18n/fr.json | 18 +++-- pollen-ui-riot-js/src/main/web/js/PollForm.js | 11 ++- pollen-ui-riot-js/src/main/web/js/Session.js | 1 + .../web/tag/components/date-time-picker.tag.html | 10 +-- .../main/web/tag/components/time-picker.tag.html | 12 +-- .../src/main/web/tag/poll/ChoiceView.tag.html | 22 ++++- .../src/main/web/tag/poll/EditVote.tag.html | 10 ++- .../src/main/web/tag/poll/Results.tag.html | 12 ++- .../src/main/web/tag/poll/VotesTable.tag.html | 10 ++- .../voteCountingType/BordaDetailResult.tag.html | 4 +- .../voteCountingType/CoombsDetailResult.tag.html | 4 +- .../InstantRunoffDetailResult.tag.html | 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 +- .../votecounting/CoombsVoteCountingStrategy.java | 2 +- .../CoombsVoteCountingStrategyTest.java | 26 +++++- 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 +- 46 files changed, 382 insertions(+), 120 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.