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 61d26648 Merge branch 'release/3.1.4' adds e157d377 ref #213 : Correction sur les modifications concurentes d'un sondage adds 95fbf029 ref #214 : Si la fénétre permet de voir plus d'une page de donné chargé la page suivant dans la foulé new 2ecb46f2 modification de la version pour la release du hotfix new 55ff65db Merge branch 'hotfix/3.1.5' 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 55ff65db3dc8cc04bab690b6c699777de8ceb1bf Merge: 61d26648 2ecb46f2 Author: sbavencoff <bavencoff@codelutin.com> Date: Fri Jun 1 17:41:44 2018 +0200 Merge branch 'hotfix/3.1.5' commit 2ecb46f29fa00095a74382fedff043aaa8079439 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Jun 1 17:41:17 2018 +0200 modification de la version pour la release du hotfix Summary of changes: pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- .../pollen/services/service/ChoiceService.java | 30 ++++++---- .../pollen/services/service/PollService.java | 69 +++++++++++++--------- .../services/service/PollenServiceSupport.java | 8 +++ pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- .../src/main/web/tag/components/LazyLoad.tag.html | 30 ++++++---- 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 +- 20 files changed, 102 insertions(+), 67 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.