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

branch release/3.1.4 deleted (was 822205ce)
by chorem.org scm May 15, 2018

May 15, 2018

This is an automated email from the git hooks/post-receive script. New change to branch release/3.1.4 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git was 822205ce release 3.1.4 success [skip ci] 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 release/3.1.4 updated (f26bdb13 -> 822205ce)
by chorem.org scm May 15, 2018

May 15, 2018

This is an automated email from the git hooks/post-receive script. New change to branch release/3.1.4 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from f26bdb13 Merge branch 'master' into develop new 822205ce release 3.1.4 success [skip ci] 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 822205cebe11e0b200ae558018f647567a90a550 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue May 15 10:10:16 2018 +0000 release 3.1.4 success [skip ci] Summary of changes: CHANGELOG | 13 +++++++++++++ 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 +- 17 files changed, 29 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch release/3.1.4 created (now f26bdb13)
by chorem.org scm May 15, 2018

May 15, 2018

This is an automated email from the git hooks/post-receive script. New change to branch release/3.1.4 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at f26bdb13 Merge branch 'master' into develop No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch develop updated (9815cc7b -> f26bdb13)
by chorem.org scm May 15, 2018

May 15, 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 9815cc7b supression de fichier inutile adds a7f4703e hot fix sur la visibilité des résultats adds 06d78498 Merge branch 'hotfix/3.1.3' new f26bdb13 Merge branch 'master' into develop 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 f26bdb13a77186f84fc6ef9b61a1897784c85402 Merge: 9815cc7b 06d78498 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue May 15 11:55:42 2018 +0200 Merge branch 'master' into develop # Conflicts: # pollen-persistence/pom.xml # pollen-rest-api/pom.xml # pollen-services/pom.xml # 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 Summary of changes: -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch release/3.1.4 deleted (was a906953c)
by chorem.org scm May 15, 2018

May 15, 2018

This is an automated email from the git hooks/post-receive script. New change to branch release/3.1.4 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git was a906953c release 3.1.4 success [skip ci] 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 release/3.1.4 updated (9815cc7b -> a906953c)
by chorem.org scm May 15, 2018

May 15, 2018

This is an automated email from the git hooks/post-receive script. New change to branch release/3.1.4 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 9815cc7b supression de fichier inutile new a906953c release 3.1.4 success [skip ci] 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 a906953c497b8661e318a45bda07718ec71c1770 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue May 15 09:32:38 2018 +0000 release 3.1.4 success [skip ci] Summary of changes: CHANGELOG | 13 +++++++++++++ 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 +- 17 files changed, 29 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch release/3.1.4 created (now 9815cc7b)
by chorem.org scm May 15, 2018

May 15, 2018

This is an automated email from the git hooks/post-receive script. New change to branch release/3.1.4 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 9815cc7b supression de fichier inutile No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch release/3.1.2 deleted (was dc801dd6)
by chorem.org scm May 15, 2018

May 15, 2018

This is an automated email from the git hooks/post-receive script. New change to branch release/3.1.2 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git was dc801dd6 fix gitlab ci release 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 develop updated (32be1952 -> 9815cc7b)
by chorem.org scm May 15, 2018

May 15, 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 32be1952 ref #207 : correction de la validation des votes (entre autre la limitation des votes cumulatifs) new 9815cc7b supression de fichier inutile 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 9815cc7b412b1e7228e33d45b83a036f28f983d6 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue May 15 10:59:02 2018 +0200 supression de fichier inutile Summary of changes: todo.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 todo.txt -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (d18a3302 -> 32be1952)
by chorem.org scm May 15, 2018

May 15, 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 d18a3302 Merge branch 'feature/CVE-updates' into 'develop' new 32be1952 ref #207 : correction de la validation des votes (entre autre la limitation des votes cumulatifs) 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 32be19522004c9c0073eb4872ee18027b321b4dd Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue May 15 10:17:41 2018 +0200 ref #207 : correction de la validation des votes (entre autre la limitation des votes cumulatifs) Summary of changes: .../pollen/services/service/VoteCountingService.java | 12 +++++++----- .../src/main/web/tag/poll/EditVote.tag.html | 5 ++--- .../voteCountingType/MajorityJudgmentConfig.tag.html | 7 +++++-- .../org/chorem/pollen/votecounting/VoteCounting.java | 17 +++++------------ .../chorem/pollen/votecounting/BordaVoteCounting.java | 14 +++++--------- .../i18n/pollen-votecounting-borda_en_GB.properties | 2 +- .../i18n/pollen-votecounting-borda_fr_FR.properties | 2 +- .../pollen/votecounting/CondorcetVoteCounting.java | 14 +++++--------- .../pollen-votecounting-condorcet_en_GB.properties | 2 +- .../pollen-votecounting-condorcet_fr_FR.properties | 2 +- .../chorem/pollen/votecounting/CoombsVoteCounting.java | 14 +++++--------- .../i18n/pollen-votecounting-coombs_en_GB.properties | 2 +- .../i18n/pollen-votecounting-coombs_fr_FR.properties | 2 +- .../pollen/votecounting/CumulativeVoteCounting.java | 18 +++++++----------- .../pollen-votecounting-cumulative_en_GB.properties | 3 ++- .../pollen-votecounting-cumulative_fr_FR.properties | 3 ++- .../pollen/votecounting/InstantRunoffVoteCounting.java | 14 +++++--------- ...pollen-votecounting-instant-runoff_en_GB.properties | 2 +- ...pollen-votecounting-instant-runoff_fr_FR.properties | 2 +- .../votecounting/MajorityJudgmentVoteCounting.java | 15 +++++---------- ...len-votecounting-majority-judgment_en_GB.properties | 2 +- ...len-votecounting-majority-judgment_fr_FR.properties | 2 +- .../chorem/pollen/votecounting/NormalVoteCounting.java | 12 ++++-------- .../chorem/pollen/votecounting/NumberVoteCounting.java | 12 ++++-------- 24 files changed, 73 insertions(+), 107 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1