June 2018 - Pollen-commits - mailman.cloud.codelutin.com

branch master updated (61d26648 -> 55ff65db)
by chorem.org scm June 1, 2018

June 1, 2018

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(a)codelutin.com> Date: Fri Jun 1 17:41:44 2018 +0200 Merge branch 'hotfix/3.1.5' commit 2ecb46f29fa00095a74382fedff043aaa8079439 Author: Sylvain Bavencoff <bavencoff(a)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(a)chorem.org>.

1 0

branch develop updated (ec3e92d4 -> c594bd23)
by chorem.org scm June 1, 2018

June 1, 2018

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 ec3e92d4 correction eslint du JS 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' new c594bd23 Merge tag '3.1.5' into develop The 3 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 c594bd23f28798fd66d166e754712e9e83170ba2 Merge: ec3e92d4 55ff65db Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Jun 1 17:48:52 2018 +0200 Merge tag '3.1.5' into develop correction de la version 3.1.5 # Conflicts: # pollen-persistence/pom.xml # pollen-rest-api/pom.xml # pollen-services/pom.xml # pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java # pollen-ui-riot-js/package.json # pollen-ui-riot-js/pom.xml # pollen-votecounting-aggregator/pom.xml # pollen-votecounting-api/pom.xml # pollen-votecounting-borda/pom.xml # pollen-votecounting-condorcet/pom.xml # pollen-votecounting-coombs/pom.xml # pollen-votecounting-cumulative/pom.xml # pollen-votecounting-instant-runoff/pom.xml # pollen-votecounting-majority-judgment/pom.xml # pollen-votecounting-normal/pom.xml # pollen-votecounting-number/pom.xml # pom.xml commit 55ff65db3dc8cc04bab690b6c699777de8ceb1bf Merge: 61d26648 2ecb46f2 Author: sbavencoff <bavencoff(a)codelutin.com> Date: Fri Jun 1 17:41:44 2018 +0200 Merge branch 'hotfix/3.1.5' commit 2ecb46f29fa00095a74382fedff043aaa8079439 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Jun 1 17:41:17 2018 +0200 modification de la version pour la release du hotfix Summary of changes: .../pollen/services/service/ChoiceService.java | 26 ++++---- .../pollen/services/service/PollService.java | 69 +++++++++++++--------- .../services/service/PollenServiceSupport.java | 8 +++ .../src/main/web/tag/components/LazyLoad.tag.html | 30 ++++++---- 4 files changed, 84 insertions(+), 49 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch hotfix/3.1.5 deleted (was 95fbf029)
by chorem.org scm June 1, 2018

June 1, 2018

This is an automated email from the git hooks/post-receive script. New change to branch hotfix/3.1.5 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git was 95fbf029 ref #214 : Si la fénétre permet de voir plus d'une page de donné chargé la page suivant dans la foulé The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch hotfix/3.1.5 updated (e157d377 -> 95fbf029)
by chorem.org scm June 1, 2018

June 1, 2018

This is an automated email from the git hooks/post-receive script. New change to branch hotfix/3.1.5 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from e157d377 ref #213 : Correction sur les modifications concurentes d'un sondage new 95fbf029 ref #214 : Si la fénétre permet de voir plus d'une page de donné chargé la page suivant dans la foulé 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 95fbf029c365b81254bfa07c8116eb835b19b586 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Jun 1 17:38:02 2018 +0200 ref #214 : Si la fénétre permet de voir plus d'une page de donné chargé la page suivant dans la foulé Summary of changes: .../src/main/web/tag/components/LazyLoad.tag.html | 30 ++++++++++++++-------- 1 file changed, 20 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch hotfix/3.1.5 created (now e157d377)
by chorem.org scm June 1, 2018

June 1, 2018

This is an automated email from the git hooks/post-receive script. New change to branch hotfix/3.1.5 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at e157d377 ref #213 : Correction sur les modifications concurentes d'un sondage This branch includes the following new commits: new e157d377 ref #213 : Correction sur les modifications concurentes d'un sondage 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 e157d37707a0614c6bff1b7d4252590682dbd338 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Jun 1 14:48:19 2018 +0200 ref #213 : Correction sur les modifications concurentes d'un sondage -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch hotfix/3.1.3 deleted (was a7f4703e)
by chorem.org scm June 1, 2018

June 1, 2018

This is an automated email from the git hooks/post-receive script. New change to branch hotfix/3.1.3 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git was a7f4703e hot fix sur la visibilité des résultats The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0