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

branch feature/149-jugement-majoritaire updated (065aa161 -> df14354a)
by chorem.org scm 06 Oct '17

06 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/149-jugement-majoritaire in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 065aa161 Ajouter la configuration des méthodes vote (ref #148). Adaptation pour Normal, Cumulatif (ancien pourcentage), Nombre et Borda new df14354a implentation du jugement majoritaire (algo de dépouillement) ref #149 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 df14354ab89eeb5cf1b267dd37b1143359cff729 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Oct 6 12:17:40 2017 +0200 implentation du jugement majoritaire (algo de dépouillement) ref #149 Summary of changes: pollen-votecounting-aggregator/pom.xml | 6 + .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 6 +- .../votecounting/MajorityJudgmentChoiceResult.java | 43 +++ .../votecounting/MajorityJudgmentConfig.java | 21 ++ .../votecounting/MajorityJudgmentDetailResult.java | 39 ++- .../votecounting/MajorityJudgmentVoteCounting.java | 30 +- .../MajorityJudgmentVoteCountingStrategy.java | 263 ++++++++++++++++ .../org.chorem.pollen.votecounting.VoteCounting | 1 + ...votecounting-majority-judgment_en_GB.properties | 4 + ...votecounting-majority-judgment_fr_FR.properties | 4 + .../MajorityJudgmentVoteCountingStrategyTest.java | 341 +++++++++++++++++++++ .../votecounting/VoteCountingFactoryTest.java | 7 +- .../src/test/resources/log4j.properties | 0 15 files changed, 729 insertions(+), 36 deletions(-) copy LICENSE.txt => pollen-votecounting-majority-judgment/LICENSE.txt (100%) copy {pollen-services => pollen-votecounting-majority-judgment}/README.md (100%) copy {pollen-votecounting-normal => pollen-votecounting-majority-judgment}/pom.xml (92%) create mode 100644 pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentChoiceResult.java create mode 100644 pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentConfig.java copy pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffDetailResult.java => pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentDetailResult.java (52%) copy pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java => pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCounting.java (72%) create mode 100644 pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategy.java create mode 100644 pollen-votecounting-majority-judgment/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCounting create mode 100644 pollen-votecounting-majority-judgment/src/main/resources/i18n/pollen-votecounting-majority-judgment_en_GB.properties create mode 100644 pollen-votecounting-majority-judgment/src/main/resources/i18n/pollen-votecounting-majority-judgment_fr_FR.properties create mode 100644 pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategyTest.java copy {pollen-votecounting-instant-runoff => pollen-votecounting-majority-judgment}/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java (86%) copy {pollen-votecounting-instant-runoff => pollen-votecounting-majority-judgment}/src/test/resources/log4j.properties (100%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (540d368f -> 37204ee8)
by chorem.org scm 05 Oct '17

05 Oct '17

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 540d368f Erreur de sérialisation de la config vide new 2b6afd92 fixes #151 placement du bouton new 37204ee8 mise en page de la section avatar du profil 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 37204ee826fc40e5ad8b7a8d1cd48d2eb7198a35 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 5 17:28:34 2017 +0200 mise en page de la section avatar du profil commit 2b6afd92ef01cca3aaaea19076dcf4b075d92fe0 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 5 15:18:05 2017 +0200 fixes #151 placement du bouton Summary of changes: pollen-ui-riot-js/src/main/web/i18n/en.json | 7 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 6 +- .../src/main/web/tag/UserProfile.tag.html | 79 +++++++++++++--------- 3 files changed, 56 insertions(+), 36 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch develop updated (065aa161 -> 540d368f)
by chorem.org scm 05 Oct '17

05 Oct '17

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 065aa161 Ajouter la configuration des méthodes vote (ref #148). Adaptation pour Normal, Cumulatif (ancien pourcentage), Nombre et Borda new bd2be132 on ne cherche l'image d'avatar que si l'utilisateur a un avatar new 1d19af87 correction de la valeur de la conf par défaut des types de sondage new 540d368f Erreur de sérialisation de la config vide 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 540d368fe8d47cd349fc73e476e03e277feced77 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 5 14:32:23 2017 +0200 Erreur de sérialisation de la config vide commit 1d19af879126f40717e2a2aa4f420d5abd4744d9 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 5 12:01:42 2017 +0200 correction de la valeur de la conf par défaut des types de sondage commit bd2be132eaba1c7582533b61b4aff6cc43fdd3b9 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 5 11:42:36 2017 +0200 on ne cherche l'image d'avatar que si l'utilisateur a un avatar Summary of changes: .../h2/V3_1_0_3__add_vote_counting_config.sql | 6 +++--- .../V3_1_0_3__add_vote_counting_config.sql | 6 +++--- ....java => EmptyVoteCountingConfigSerializer.java} | 21 ++++++++++----------- .../pollen/rest/api/converter/JacksonConfig.java | 2 ++ .../src/main/web/tag/components/Avatar.tag.html | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-) copy pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/{PollenEntityIdSerializer.java => EmptyVoteCountingConfigSerializer.java} (60%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch feature/149-jugement-majoritaire created (now 065aa161)
by chorem.org scm 04 Oct '17

04 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/149-jugement-majoritaire in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 065aa161 Ajouter la configuration des méthodes vote (ref #148). Adaptation pour Normal, Cumulatif (ancien pourcentage), Nombre et Borda 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 (050ad685 -> 065aa161)
by chorem.org scm 04 Oct '17

04 Oct '17

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 050ad685 fixes #130 sauvegarde de la langue de l'UI adds 065aa161 Ajouter la configuration des méthodes vote (ref #148). Adaptation pour Normal, Cumulatif (ancien pourcentage), Nombre et Borda No new revisions were added by this update. Summary of changes: .../h2/V3_1_0_3__add_vote_counting_config.sql | 23 +++++ .../V3_1_0_3__add_vote_counting_config.sql | 23 +++++ pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 29157 -> 29234 bytes pollen-rest-api/pom.xml | 1 - .../pollen/rest/api/converter/JacksonConfig.java | 2 + .../converter/VoteCountingConfigDeserializer.java | 111 +++++++++++++++++++++ .../org/chorem/pollen/services/bean/PollBean.java | 20 ++-- .../pollen/services/service/PollService.java | 10 +- .../services/service/VoteCountingService.java | 66 ++++++++++-- .../pollen/services/service/VoteService.java | 28 ++++-- pollen-ui-riot-js/src/main/web/i18n/en.json | 17 ++-- pollen-ui-riot-js/src/main/web/i18n/fr.json | 17 ++-- pollen-ui-riot-js/src/main/web/js/PollForm.js | 2 +- .../src/main/web/tag/poll/Settings.tag.html | 58 ++++------- .../src/main/web/tag/poll/Votes.tag.html | 8 +- .../web/tag/voteCountingType/BordaConfig.tag.html | 107 ++++++++++++++++++++ .../voteCountingType/BordaDetailResult.tag.html | 12 +-- .../tag/voteCountingType/CumulativeConfig.tag.html | 34 +++++++ .../MaxChoicesNumberConfig.tag.html | 60 +++++++++++ pollen-votecounting-aggregator/pom.xml | 4 +- pollen-votecounting-api/pom.xml | 4 + .../pollen/votecounting/AbstractVoteCounting.java | 14 ++- .../votecounting/AbstractVoteCountingStrategy.java | 10 +- .../chorem/pollen/votecounting/VoteCounting.java | 14 ++- .../pollen/votecounting/VoteCountingFactory.java | 3 +- .../pollen/votecounting/VoteCountingStrategy.java | 5 +- .../model/EmptyVoteCountingConfig.java | 7 ++ .../votecounting/model/MaxChoicesNumberConfig.java | 17 ++++ .../votecounting/model/VoteCountingConfig.java | 7 ++ .../chorem/pollen/votecounting/BordaConfig.java | 21 ++++ .../pollen/votecounting/BordaVoteCounting.java | 7 +- .../votecounting/BordaVoteCountingStrategy.java | 38 ++++++- .../pollen-votecounting-borda_fr_FR.properties | 2 +- .../BordaVoteCountingStrategyTest.java | 8 +- .../pollen/votecounting/CondorcetVoteCounting.java | 8 +- .../CondorcetVoteCountingStrategy.java | 3 +- .../pollen-votecounting-condorcet_fr_FR.properties | 2 +- .../CondorcetVoteCountingStrategyTest.java | 8 +- .../pollen/votecounting/CoombsVoteCounting.java | 8 +- .../votecounting/CoombsVoteCountingStrategy.java | 3 +- .../pollen-votecounting-coombs_en_GB.properties | 2 +- .../pollen-votecounting-coombs_fr_FR.properties | 2 +- .../CoombsVoteCountingStrategyTest.java | 8 +- .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 6 +- .../pollen/votecounting/CumulativeConfig.java | 19 ++++ .../votecounting/CumulativeVoteCounting.java | 21 ++-- .../CumulativeVoteCountingStrategy.java | 2 +- .../org.chorem.pollen.votecounting.VoteCounting | 1 + ...pollen-votecounting-cumulative_en_GB.properties | 4 + ...pollen-votecounting-cumulative_fr_FR.properties | 4 + .../CumulativeVoteCountingStrategyTest.java | 14 +-- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j.properties | 0 .../votecounting/InstantRunoffVoteCounting.java | 16 +-- .../InstantRunoffVoteCountingStrategy.java | 3 +- .../InstantRunoffVoteCountingStrategyTest.java | 8 +- .../pollen/votecounting/NormalVoteCounting.java | 16 +-- .../votecounting/NormalVoteCountingStrategy.java | 3 +- .../NormalVoteCountingStrategyTest.java | 8 +- .../pollen/votecounting/NumberVoteCounting.java | 16 +-- .../votecounting/NumberVoteCountingStrategy.java | 9 +- .../NumberVoteCountingStrategyTest.java | 9 +- .../org.chorem.pollen.votecounting.VoteCounting | 1 - ...pollen-votecounting-percentage_en_GB.properties | 4 - ...pollen-votecounting-percentage_fr_FR.properties | 4 - 68 files changed, 781 insertions(+), 195 deletions(-) create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_1_0_3__add_vote_counting_config.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_1_0_3__add_vote_counting_config.sql create mode 100644 pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/VoteCountingConfigDeserializer.java create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/BordaConfig.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/CumulativeConfig.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/MaxChoicesNumberConfig.tag.html create mode 100644 pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/EmptyVoteCountingConfig.java create mode 100644 pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/MaxChoicesNumberConfig.java create mode 100644 pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingConfig.java create mode 100644 pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaConfig.java rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/LICENSE.txt (100%) rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/README.md (100%) rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/pom.xml (93%) create mode 100644 pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeConfig.java rename pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java => pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeVoteCounting.java (77%) rename pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java => pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeVoteCountingStrategy.java (97%) create mode 100644 pollen-votecounting-cumulative/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCounting create mode 100644 pollen-votecounting-cumulative/src/main/resources/i18n/pollen-votecounting-cumulative_en_GB.properties create mode 100644 pollen-votecounting-cumulative/src/main/resources/i18n/pollen-votecounting-cumulative_fr_FR.properties rename pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java => pollen-votecounting-cumulative/src/test/java/org/chorem/pollen/votecounting/CumulativeVoteCountingStrategyTest.java (97%) rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java (95%) rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/src/test/resources/log4j.properties (100%) delete mode 100644 pollen-votecounting-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCounting delete mode 100644 pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_en_GB.properties delete mode 100644 pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_fr_FR.properties -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/148-configuration-methodes-de-votes deleted (was 065aa161)
by chorem.org scm 04 Oct '17

04 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/148-configuration-methodes-de-votes in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git was 065aa161 Ajouter la configuration des méthodes vote (ref #148). Adaptation pour Normal, Cumulatif (ancien pourcentage), Nombre et Borda 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 feature/148-configuration-methodes-de-votes updated (050ad685 -> 065aa161)
by chorem.org scm 04 Oct '17

04 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/148-configuration-methodes-de-votes in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 050ad685 fixes #130 sauvegarde de la langue de l'UI new 065aa161 Ajouter la configuration des méthodes vote (ref #148). Adaptation pour Normal, Cumulatif (ancien pourcentage), Nombre et Borda 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 065aa1618483d53b8267cfd69fb7324b0cbc11b7 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Oct 4 15:03:39 2017 +0200 Ajouter la configuration des méthodes vote (ref #148). Adaptation pour Normal, Cumulatif (ancien pourcentage), Nombre et Borda Summary of changes: .../h2/V3_1_0_3__add_vote_counting_config.sql | 23 +++++ .../V3_1_0_3__add_vote_counting_config.sql | 23 +++++ pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 29157 -> 29234 bytes pollen-rest-api/pom.xml | 1 - .../pollen/rest/api/converter/JacksonConfig.java | 2 + .../converter/VoteCountingConfigDeserializer.java | 111 +++++++++++++++++++++ .../org/chorem/pollen/services/bean/PollBean.java | 20 ++-- .../pollen/services/service/PollService.java | 10 +- .../services/service/VoteCountingService.java | 66 ++++++++++-- .../pollen/services/service/VoteService.java | 28 ++++-- pollen-ui-riot-js/src/main/web/i18n/en.json | 17 ++-- pollen-ui-riot-js/src/main/web/i18n/fr.json | 17 ++-- pollen-ui-riot-js/src/main/web/js/PollForm.js | 2 +- .../src/main/web/tag/poll/Settings.tag.html | 58 ++++------- .../src/main/web/tag/poll/Votes.tag.html | 8 +- .../web/tag/voteCountingType/BordaConfig.tag.html | 107 ++++++++++++++++++++ .../voteCountingType/BordaDetailResult.tag.html | 12 +-- .../tag/voteCountingType/CumulativeConfig.tag.html | 34 +++++++ .../MaxChoicesNumberConfig.tag.html | 60 +++++++++++ pollen-votecounting-aggregator/pom.xml | 4 +- pollen-votecounting-api/pom.xml | 4 + .../pollen/votecounting/AbstractVoteCounting.java | 14 ++- .../votecounting/AbstractVoteCountingStrategy.java | 10 +- .../chorem/pollen/votecounting/VoteCounting.java | 14 ++- .../pollen/votecounting/VoteCountingFactory.java | 3 +- .../pollen/votecounting/VoteCountingStrategy.java | 5 +- .../model/EmptyVoteCountingConfig.java | 7 ++ .../votecounting/model/MaxChoicesNumberConfig.java | 17 ++++ .../votecounting/model/VoteCountingConfig.java | 7 ++ .../chorem/pollen/votecounting/BordaConfig.java | 21 ++++ .../pollen/votecounting/BordaVoteCounting.java | 7 +- .../votecounting/BordaVoteCountingStrategy.java | 38 ++++++- .../pollen-votecounting-borda_fr_FR.properties | 2 +- .../BordaVoteCountingStrategyTest.java | 8 +- .../pollen/votecounting/CondorcetVoteCounting.java | 8 +- .../CondorcetVoteCountingStrategy.java | 3 +- .../pollen-votecounting-condorcet_fr_FR.properties | 2 +- .../CondorcetVoteCountingStrategyTest.java | 8 +- .../pollen/votecounting/CoombsVoteCounting.java | 8 +- .../votecounting/CoombsVoteCountingStrategy.java | 3 +- .../pollen-votecounting-coombs_en_GB.properties | 2 +- .../pollen-votecounting-coombs_fr_FR.properties | 2 +- .../CoombsVoteCountingStrategyTest.java | 8 +- .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 6 +- .../pollen/votecounting/CumulativeConfig.java | 19 ++++ .../votecounting/CumulativeVoteCounting.java | 21 ++-- .../CumulativeVoteCountingStrategy.java | 2 +- .../org.chorem.pollen.votecounting.VoteCounting | 1 + ...pollen-votecounting-cumulative_en_GB.properties | 4 + ...pollen-votecounting-cumulative_fr_FR.properties | 4 + .../CumulativeVoteCountingStrategyTest.java | 14 +-- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j.properties | 0 .../votecounting/InstantRunoffVoteCounting.java | 16 +-- .../InstantRunoffVoteCountingStrategy.java | 3 +- .../InstantRunoffVoteCountingStrategyTest.java | 8 +- .../pollen/votecounting/NormalVoteCounting.java | 16 +-- .../votecounting/NormalVoteCountingStrategy.java | 3 +- .../NormalVoteCountingStrategyTest.java | 8 +- .../pollen/votecounting/NumberVoteCounting.java | 16 +-- .../votecounting/NumberVoteCountingStrategy.java | 9 +- .../NumberVoteCountingStrategyTest.java | 9 +- .../org.chorem.pollen.votecounting.VoteCounting | 1 - ...pollen-votecounting-percentage_en_GB.properties | 4 - ...pollen-votecounting-percentage_fr_FR.properties | 4 - 68 files changed, 781 insertions(+), 195 deletions(-) create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_1_0_3__add_vote_counting_config.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_1_0_3__add_vote_counting_config.sql create mode 100644 pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/VoteCountingConfigDeserializer.java create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/BordaConfig.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/CumulativeConfig.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/MaxChoicesNumberConfig.tag.html create mode 100644 pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/EmptyVoteCountingConfig.java create mode 100644 pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/MaxChoicesNumberConfig.java create mode 100644 pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingConfig.java create mode 100644 pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaConfig.java rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/LICENSE.txt (100%) rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/README.md (100%) rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/pom.xml (93%) create mode 100644 pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeConfig.java rename pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java => pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeVoteCounting.java (77%) rename pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java => pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeVoteCountingStrategy.java (97%) create mode 100644 pollen-votecounting-cumulative/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCounting create mode 100644 pollen-votecounting-cumulative/src/main/resources/i18n/pollen-votecounting-cumulative_en_GB.properties create mode 100644 pollen-votecounting-cumulative/src/main/resources/i18n/pollen-votecounting-cumulative_fr_FR.properties rename pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java => pollen-votecounting-cumulative/src/test/java/org/chorem/pollen/votecounting/CumulativeVoteCountingStrategyTest.java (97%) rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java (95%) rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/src/test/resources/log4j.properties (100%) delete mode 100644 pollen-votecounting-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCounting delete mode 100644 pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_en_GB.properties delete mode 100644 pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_fr_FR.properties -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/148-configuration-methodes-de-votes updated (4e17e544 -> 050ad685)
by chorem.org scm 04 Oct '17

04 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/148-configuration-methodes-de-votes in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 4e17e544 Merge tag '3.0.1' into develop adds 17348adb fixes #151 I cannot delete my account adds 73c393df fixes #46 Remove DevMode adds 050ad685 fixes #130 sauvegarde de la langue de l'UI No new revisions were added by this update. Summary of changes: .../org/chorem/pollen/rest/api/v1/AuthApi.java | 9 +------ .../chorem/pollen/rest/api/v1/PollenUserApi.java | 14 ++++++++-- pollen-services/src/main/config/PollenServices.ini | 8 ------ .../pollen/services/service/PollenUserService.java | 28 +++++++++++++------- .../pollen/services/service/mail/EmailService.java | 30 ++++++++++++---------- .../services/service/security/SecurityService.java | 2 ++ pollen-ui-riot-js/src/main/web/i18n/en.json | 3 ++- pollen-ui-riot-js/src/main/web/i18n/fr.json | 1 + pollen-ui-riot-js/src/main/web/js/Session.js | 3 ++- .../src/main/web/tag/PollenHeader.tag.html | 2 +- .../src/main/web/tag/UserProfile.tag.html | 16 ++++++++++++ .../src/main/web/tag/popup/ConfirmPopup.tag.html | 23 ++++++++++++++--- 12 files changed, 92 insertions(+), 47 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 (17348adb -> 050ad685)
by chorem.org scm 03 Oct '17

03 Oct '17

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 17348adb fixes #151 I cannot delete my account new 73c393df fixes #46 Remove DevMode new 050ad685 fixes #130 sauvegarde de la langue de l'UI 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 050ad68591ee485b8231e8e8f415a41af7d76591 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 3 11:45:48 2017 +0200 fixes #130 sauvegarde de la langue de l'UI commit 73c393df3094b57440fd58cf3a6806155a3162c2 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 3 11:32:22 2017 +0200 fixes #46 Remove DevMode Summary of changes: pollen-services/src/main/config/PollenServices.ini | 8 ------ .../pollen/services/service/mail/EmailService.java | 30 ++++++++++++---------- pollen-ui-riot-js/src/main/web/i18n/en.json | 2 +- pollen-ui-riot-js/src/main/web/js/Session.js | 3 ++- 4 files changed, 19 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch develop updated (4e17e544 -> 17348adb)
by chorem.org scm 03 Oct '17

03 Oct '17

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 4e17e544 Merge tag '3.0.1' into develop adds 17348adb fixes #151 I cannot delete my account No new revisions were added by this update. Summary of changes: .../org/chorem/pollen/rest/api/v1/AuthApi.java | 9 +------ .../chorem/pollen/rest/api/v1/PollenUserApi.java | 14 +++++++++-- .../pollen/services/service/PollenUserService.java | 28 +++++++++++++++------- .../services/service/security/SecurityService.java | 2 ++ pollen-ui-riot-js/src/main/web/i18n/en.json | 1 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 1 + .../src/main/web/tag/PollenHeader.tag.html | 2 +- .../src/main/web/tag/UserProfile.tag.html | 16 +++++++++++++ .../src/main/web/tag/popup/ConfirmPopup.tag.html | 23 +++++++++++++++--- 9 files changed, 73 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0