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 80045391 Merge branch 'release/3.1.0' adds cac29251 Merge tag '3.1.0' into develop adds 4b2dbc36 develop ne devrait jamais rester en version stable adds dc3f4311 Fix typo : Valiation -> Validation adds 7387aa42 Fix typo : Resultats -> Résultats adds e61f964c Remplacement du terme 'url' par 'lien' dans les messages utilisateurs (pour plus de user-friendly) adds 48f6bcc6 Mise en cohérence de la version JS avec la version Java adds 06185bc0 Ajout d'un TODO : Ne pas générer les preview à chaque appel adds 3d2d2a53 Singularisation de termes adds 070a5c22 fixes #184 Wrong display of yes/no votes adds 16365cc6 Plus grandes miniatures (quasi illisible avant modif) adds eff81bf5 Utilisation d'unité relatives adds 91d0b0c8 Merge branch 'feature/taille_des_images' into 'develop' adds c508eda4 Ajout de la possibilité d'afficher des Tooltips sur le composant ChoiceView adds e07c3ab7 Affichage des tooltip sur la gauche lors du vote adds d549a9f4 Désactivation du tooltip système si le tooltip 'joli' :sparkles: est utilisé adds e3effbac refs #185 Utilisation des tooltips 'jolis' :sparkles: sur la page des résultats et dans le détail des dépouillements où ça a du sens adds 9af35a15 Merge branch 'feature/display_nice_tooltips' into 'develop' adds daf59bbc fixes #182 Correction de l'affichage quand un choix coombs est éliminé adds 6329da47 chain promises in order to catch the errors of updateChoice or addChoice adds 3613ab3e fixes #189 I cannot add choices to my polls anymore adds d1ae69ff refs #188 [Coombs] Ajout d'un test pour valider que la majorité l'emporte bien sans générer de tour superflu adds 97c951b4 correction du tri du décompt des voies adds 6dffa9f8 Merge branch 'feature/188_mauvais_depouillement_coombs' into develop adds 2c3f28c9 Documentation : Ajout d'une FAQ et petites modifications adds 9d432bd7 Documentation : Modification du style de la doc adds 79d3dca7 Merge branch 'feature/180_Documentation_fonctionnelle' into 'develop' adds 0367c95b correction de la getion des input de type date, time et datetime (ref #178) adds addb1414 correction du job de release adds d2dbd2ce release 3.1.1 success [skip ci] new dd3cef74 Merge branch 'release/3.1.1' into 'master' 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 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 Summary of changes: .gitlab-ci.yml | 13 +-- CHANGELOG | 11 +++ docs/config.md | 2 +- docs/css/material-custom.css | 32 ++++++++ docs/electionMethods.md | 2 +- docs/faq.md | 63 +++++++++++++++ .../src/main/web/css => docs/font}/Pacifico.ttf | Bin 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(-) create mode 100644 docs/css/material-custom.css create mode 100644 docs/faq.md copy {pollen-ui-riot-js/src/main/web/css => docs/font}/Pacifico.ttf (100%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.