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

branch develop updated (8281c4c0 -> 1a9d7396)
by chorem.org scm 16 Oct '17

16 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 8281c4c0 ajout du type de bouton adds 681c5f06 refs #44 debut de modifs du back pour accepter plusieurs emails par utilisateur adds 4984c6df fichier oublié adds 062dbeac refs #44 checks de sécurité + refactoring + tests unitaires adds 36295f55 corrections exceptions adds 36c7fa73 refs #44 correction de la migration adds e574d5ce refs #44 envoi d'un mail pour validation de l'adresse email adds cd10e94e refs #44 corrections adds 8c99b526 refs #44 nouvelle ui pour les adresses email adds 41a0c8a3 refs #44 meilleure gestion des emails de validation adds 86a73fba refs #44 validation de l'adresse email par l'admin adds ca0eeef8 refs #44 gestion des adresses email par l'admin adds 90f30944 gestion de l'avatar par l'admin adds afb6df3c refs #44 correction de la migration pour ajouter les emails des providers new 1a9d7396 fixes #44 Several email addresses for the users 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 1a9d739657f12250a6fc32a01fcaee41c552e557 Merge: 8281c4c0 afb6df3c Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 16 11:59:20 2017 +0200 fixes #44 Several email addresses for the users Summary of changes: .../common/V3_1_0_5__Extract_email_addresses.java | 107 +++++++++++ .../entity/PollenUserEmailAddressTopiaDao.java | 21 ++ .../pollen/persistence/entity/PollenUserImpl.java | 2 +- .../persistence/entity/PollenUserTopiaDao.java | 23 ++- .../pollen/persistence/entity/PollenUsers.java | 35 ---- .../persistence/entity/UserCredentialTopiaDao.java | 18 +- .../h2/V3_1_0_4__add_email_address_table.sql | 13 ++ .../h2/V3_1_0_6__drop_email_from_user.sql | 2 + .../V3_1_0_4__add_email_address_table.sql | 13 ++ .../postgresql/V3_1_0_6__drop_email_from_user.sql | 2 + pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 29234 -> 30366 bytes .../pollen/rest/api/PollenRestApiApplication.java | 2 + .../rest/api/PollenRestApiApplicationListener.java | 4 +- ... PollenDefaultEmailAddressExceptionMapper.java} | 12 +- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 69 +++++++ .../chorem/pollen/rest/api/PollenUserApiTest.java | 2 +- .../org/chorem/pollen/services/PollenFixtures.java | 4 + .../pollen/services/bean/PollenUserBean.java | 30 ++- .../services/bean/PollenUserEmailAddressBean.java | 33 ++++ .../pollen/services/service/FixturesService.java | 7 + .../services/service/NotificationService.java | 49 +++-- .../pollen/services/service/PollService.java | 6 +- .../services/service/PollenServiceSupport.java | 5 + .../pollen/services/service/PollenUserService.java | 214 +++++++++++++++------ .../pollen/services/service/SocialAuthService.java | 36 +++- .../pollen/services/service/VoterListService.java | 82 +------- .../pollen/services/service/mail/EmailService.java | 22 ++- .../services/service/mail/LostPasswordEmail.java | 3 - .../service/mail/ResendValidationEmail.java | 12 -- .../service/mail/UserAccountCreatedEmail.java | 20 -- .../mail/UserAccountCreatedFromProviderEmail.java | 3 - .../service/mail/UserAccountDeletedEmail.java | 3 - .../service/mail/UserAccountEditedEmail.java | 3 - ...java => UserAccountEmailAddressAddedEmail.java} | 23 ++- .../mail/UserAccountEmailValidatedEmail.java | 3 - .../mail/UserAccountPasswordChangedEmail.java | 3 - ...ava => PollenDefaultEmailAddressException.java} | 6 +- .../service/security/PollenSecurityRealm.java | 2 +- .../services/service/security/SecurityService.java | 21 +- .../resources/email/ResendValidationEmail.mustache | 6 +- .../email/ResendValidationEmail_fr.mustache | 6 +- .../email/UserAccountCreatedEmail.mustache | 8 +- .../email/UserAccountCreatedEmail_fr.mustache | 8 +- .../UserAccountEmailAddressAddedEmail.mustache | 5 + .../UserAccountEmailAddressAddedEmail_fr.mustache | 5 + .../email/UserAccountEmailValidatedEmail.mustache | 4 +- .../UserAccountEmailValidatedEmail_fr.mustache | 4 +- pollen-services/src/main/resources/fixtures.yaml | 49 ++++- .../i18n/pollen-services_en_GB.properties | 38 ++-- .../i18n/pollen-services_fr_FR.properties | 6 +- .../services/service/FavoriteListServiceTest.java | 10 +- .../pollen/services/service/PollServiceTest.java | 10 +- .../services/service/PollenUserServiceTest.java | 151 +++++++++------ .../services/service/VoterListServiceTest.java | 6 +- pollen-ui-riot-js/src/main/web/css/main.css | 8 + pollen-ui-riot-js/src/main/web/i18n/en.json | 33 ++-- pollen-ui-riot-js/src/main/web/i18n/fr.json | 72 ++++--- pollen-ui-riot-js/src/main/web/js/AuthService.js | 4 + pollen-ui-riot-js/src/main/web/js/UserService.js | 43 ++++- .../src/main/web/tag/PollenHeader.tag.html | 4 +- .../src/main/web/tag/SignCheck.tag.html | 17 +- .../src/main/web/tag/UserProfile.tag.html | 118 ++++++------ .../src/main/web/tag/admin/UserCard.tag.html | 7 +- .../src/main/web/tag/admin/UserEditModal.tag.html | 169 +++++++++------- .../src/main/web/tag/components/Card.tag.html | 8 +- .../tag/components/UserEmailAddressList.tag.html | 139 +++++++++++++ .../main/web/tag/popup/InformationPopup.tag.html | 2 +- .../src/main/web/tag/popup/Modal.tag.html | 2 +- 69 files changed, 1228 insertions(+), 631 deletions(-) create mode 100644 pollen-persistence/src/main/java/db/migration/common/V3_1_0_5__Extract_email_addresses.java create mode 100644 pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserEmailAddressTopiaDao.java delete mode 100644 pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUsers.java create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_1_0_4__add_email_address_table.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_1_0_6__drop_email_from_user.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_1_0_4__add_email_address_table.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_1_0_6__drop_email_from_user.sql copy pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/exceptionMappers/{PollenUserBannedExceptionMapper.java => PollenDefaultEmailAddressExceptionMapper.java} (68%) create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenUserEmailAddressBean.java copy pollen-services/src/main/java/org/chorem/pollen/services/service/mail/{UserAccountDeletedEmail.java => UserAccountEmailAddressAddedEmail.java} (70%) copy pollen-services/src/main/java/org/chorem/pollen/services/service/security/{PollenUserBannedException.java => PollenDefaultEmailAddressException.java} (86%) create mode 100644 pollen-services/src/main/resources/email/UserAccountEmailAddressAddedEmail.mustache create mode 100644 pollen-services/src/main/resources/email/UserAccountEmailAddressAddedEmail_fr.mustache create mode 100644 pollen-ui-riot-js/src/main/web/tag/components/UserEmailAddressList.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/44_several_email_address updated (90f30944 -> afb6df3c)
by chorem.org scm 16 Oct '17

16 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/44_several_email_address in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 90f30944 gestion de l'avatar par l'admin new afb6df3c refs #44 correction de la migration pour ajouter les emails des providers 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 afb6df3c9513ff5339c109d66f456aabf7eeee55 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 16 11:49:11 2017 +0200 refs #44 correction de la migration pour ajouter les emails des providers Summary of changes: .../common/V3_1_0_5__Extract_email_addresses.java | 24 +++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/44_several_email_address updated (57d016d0 -> 90f30944)
by chorem.org scm 16 Oct '17

16 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/44_several_email_address in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git omits 57d016d0 refs #44 correction de la migration omits 57687fee corrections exceptions omits beb73f87 refs #44 checks de sécurité + refactoring + tests unitaires omits f9cdab49 fichier oublié omits cc5d175c refs #44 debut de modifs du back pour accepter plusieurs emails par utilisateur adds 200e8231 implentation du jugement majoritaire (algo de dépouillement) ref #149 adds d989f50e Configuration du jugement majoritaire a l'edition du sondage ref #149 adds dd36bebb modification de l'écran de vote pour la jugement majoritaire ref #149 adds ddf81a43 modification de l'écran de résultat pour la jugement majoritaire ref #149 adds 3fe4ce2f Merge branch 'feature/149-jugement-majoritaire' into develop adds 7249b09f correction de l'id de la resource pour les choix de type resource adds 55e0db1c correction couleur des commentaires adds 56c2b402 Borda : mise a jour du nombre de rangs si le nombre de choix change adds 8281c4c0 ajout du type de bouton new 681c5f06 refs #44 debut de modifs du back pour accepter plusieurs emails par utilisateur new 4984c6df fichier oublié new 062dbeac refs #44 checks de sécurité + refactoring + tests unitaires new 36295f55 corrections exceptions new 36c7fa73 refs #44 correction de la migration new e574d5ce refs #44 envoi d'un mail pour validation de l'adresse email new cd10e94e refs #44 corrections new 8c99b526 refs #44 nouvelle ui pour les adresses email new 41a0c8a3 refs #44 meilleure gestion des emails de validation new 86a73fba refs #44 validation de l'adresse email par l'admin new ca0eeef8 refs #44 gestion des adresses email par l'admin new 90f30944 gestion de l'avatar par l'admin This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (57d016d0) \ N -- N -- N refs/heads/feature/44_several_email_address (90f30944) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 12 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 90f30944d050b55e87026d49a8c396521b19a263 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 16 11:18:59 2017 +0200 gestion de l'avatar par l'admin commit ca0eeef88116a1851487cd75a54c0c5b22214d88 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 16 11:01:59 2017 +0200 refs #44 gestion des adresses email par l'admin commit 86a73fba8d010b59ec2d29ed3f2fa3307bf8f20b Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 16 11:01:25 2017 +0200 refs #44 validation de l'adresse email par l'admin commit 41a0c8a3773cd869fbb4ab2d1320000d9fffd54c Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 12 16:05:59 2017 +0200 refs #44 meilleure gestion des emails de validation commit 8c99b526f2a41361eea13396fef7fdabeeb0f6e0 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 12 15:32:02 2017 +0200 refs #44 nouvelle ui pour les adresses email commit cd10e94e18679a99ef8354b63d369ad5e80c25dc Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 12 15:31:25 2017 +0200 refs #44 corrections commit e574d5ced9bd6b5a19791aad7316e508c5d2ca9c Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 12 15:31:03 2017 +0200 refs #44 envoi d'un mail pour validation de l'adresse email commit 36c7fa73ad5ee0e2b7263392e617784d2c3ecc70 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 9 18:15:06 2017 +0200 refs #44 correction de la migration commit 36295f55664cf06f2ffe58126345fe7a993c8595 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 9 17:01:01 2017 +0200 corrections exceptions commit 062dbeaccc2bd720e394d829bde2ef264d27c815 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 9 16:43:06 2017 +0200 refs #44 checks de sécurité + refactoring + tests unitaires commit 4984c6dfb80e2cade74af8539cff85fe6f7de069 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 5 10:46:13 2017 +0200 fichier oublié commit 681c5f06e76c7215f9137bc1f429dde69d1d6804 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 5 10:34:12 2017 +0200 refs #44 debut de modifs du back pour accepter plusieurs emails par utilisateur Summary of changes: .../converter/VoteCountingConfigDeserializer.java | 17 + .../chorem/pollen/rest/api/v1/PollenUserApi.java | 47 ++- pollen-services/pom.xml | 5 + .../pollen/services/bean/VoteCountingTypeBean.java | 4 + .../voteCounting/VoteCountingDetailResultBean.java | 8 + .../MajorityJudgmentChoiceResultBean.java | 62 ++++ .../MajorityJudgmentDetailResultBean.java | 58 ++++ .../pollen/services/service/ChoiceService.java | 2 +- .../services/service/NotificationService.java | 8 + .../pollen/services/service/PollenUserService.java | 33 ++ .../pollen/services/service/SocialAuthService.java | 2 +- .../pollen/services/service/mail/EmailService.java | 15 +- .../service/mail/ResendValidationEmail.java | 9 - .../service/mail/UserAccountCreatedEmail.java | 17 - ...java => UserAccountEmailAddressAddedEmail.java} | 20 +- .../resources/email/ResendValidationEmail.mustache | 6 +- .../email/ResendValidationEmail_fr.mustache | 6 +- .../email/UserAccountCreatedEmail.mustache | 8 +- .../email/UserAccountCreatedEmail_fr.mustache | 8 +- .../UserAccountEmailAddressAddedEmail.mustache | 5 + .../UserAccountEmailAddressAddedEmail_fr.mustache | 5 + .../email/UserAccountEmailValidatedEmail.mustache | 4 +- .../UserAccountEmailValidatedEmail_fr.mustache | 4 +- .../i18n/pollen-services_en_GB.properties | 1 + .../i18n/pollen-services_fr_FR.properties | 1 + pollen-ui-riot-js/src/main/web/css/main.css | 8 + pollen-ui-riot-js/src/main/web/i18n/en.json | 41 ++- pollen-ui-riot-js/src/main/web/i18n/fr.json | 80 +++-- pollen-ui-riot-js/src/main/web/js/AuthService.js | 4 + pollen-ui-riot-js/src/main/web/js/Poll.js | 6 +- pollen-ui-riot-js/src/main/web/js/UserService.js | 43 ++- .../src/main/web/tag/PollenHeader.tag.html | 4 +- .../src/main/web/tag/SignCheck.tag.html | 17 +- .../src/main/web/tag/UserProfile.tag.html | 118 +++---- .../src/main/web/tag/admin/UserCard.tag.html | 7 +- .../src/main/web/tag/admin/UserEditModal.tag.html | 169 +++++----- .../src/main/web/tag/components/Card.tag.html | 8 +- .../tag/components/UserEmailAddressList.tag.html | 139 +++++++++ .../src/main/web/tag/poll/Comments.tag.html | 6 +- .../src/main/web/tag/poll/Results.tag.html | 16 +- .../src/main/web/tag/poll/Settings.tag.html | 5 + .../src/main/web/tag/poll/Summary.tag.html | 7 +- .../src/main/web/tag/poll/Votes.tag.html | 40 ++- .../main/web/tag/popup/InformationPopup.tag.html | 2 +- .../src/main/web/tag/popup/Modal.tag.html | 2 +- .../web/tag/voteCountingType/BordaConfig.tag.html | 11 +- .../MajorityJudgmentConfig.tag.html | 84 +++++ .../MajorityJudgmentDetailResult.tag.html | 222 ++++++++++++++ pollen-votecounting-aggregator/pom.xml | 6 + .../votecounting/model/ChoiceToVoteRenderType.java | 5 +- .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 6 +- .../votecounting/MajorityJudgmentChoiceResult.java | 43 +++ .../votecounting/MajorityJudgmentConfig.java | 21 ++ .../votecounting/MajorityJudgmentDetailResult.java | 39 ++- .../votecounting/MajorityJudgmentVoteCounting.java | 36 +-- .../MajorityJudgmentVoteCountingStrategy.java | 264 ++++++++++++++++ .../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 64 files changed, 1854 insertions(+), 317 deletions(-) create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/voteCounting/majorityJugment/MajorityJudgmentChoiceResultBean.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/voteCounting/majorityJugment/MajorityJudgmentDetailResultBean.java copy pollen-services/src/main/java/org/chorem/pollen/services/service/mail/{ResendValidationEmail.java => UserAccountEmailAddressAddedEmail.java} (74%) create mode 100644 pollen-services/src/main/resources/email/UserAccountEmailAddressAddedEmail.mustache create mode 100644 pollen-services/src/main/resources/email/UserAccountEmailAddressAddedEmail_fr.mustache create mode 100644 pollen-ui-riot-js/src/main/web/tag/components/UserEmailAddressList.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/MajorityJudgmentConfig.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/MajorityJudgmentDetailResult.tag.html 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 (68%) 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 5

branch feature/85-droits-utilisateurs updated (8281c4c0 -> 9401eb9a)
by chorem.org scm 13 Oct '17

13 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/85-droits-utilisateurs in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 8281c4c0 ajout du type de bouton new 9401eb9a en fonction de la configuration serveur rendre obligatoire la connexion des utilisateur (refs #85) 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 9401eb9ab6efc3659e1788d07a8289922abd120b Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Oct 13 15:48:40 2017 +0200 en fonction de la configuration serveur rendre obligatoire la connexion des utilisateur (refs #85) Summary of changes: .../pollen/rest/api/PollenRestApiApplication.java | 4 + .../rest/api/PollenRestApiRequestFilter.java | 51 ++- .../PollenUnauthorizedExceptionMapper.java | 2 +- .../PollenUserUnknownExceptionMapper.java | 20 + .../org/chorem/pollen/rest/api/v1/AuthApi.java | 3 +- .../pollen/rest/api/v1/ConfigurationApi.java | 29 ++ .../org/chorem/pollen/rest/api/v1/PollApi.java | 2 +- pollen-services/src/main/config/PollenServices.ini | 8 +- .../pollen/services/bean/ConfigurationBean.java | 17 + .../pollen/services/service/ChoiceService.java | 6 + .../pollen/services/service/CommentService.java | 7 + .../services/service/ConfigurationService.java | 17 + .../pollen/services/service/FeedService.java | 2 + .../chorem/pollen/services/service/GtuService.java | 2 + .../pollen/services/service/PollService.java | 33 +- .../services/service/PollenResourceService.java | 7 + .../services/service/PollenServiceSupport.java | 8 + .../pollen/services/service/ReportService.java | 10 + .../pollen/services/service/SocialAuthService.java | 1 + .../services/service/VoteCountingService.java | 1 + .../services/service/VoteCountingTypeService.java | 2 + .../pollen/services/service/VoteService.java | 8 + .../pollen/services/service/VoterListService.java | 15 + .../security/PollenEmailNotValidatedException.java | 2 + .../security/PollenUserBannedException.java | 2 + ...eption.java => PollenUserUnknownException.java} | 8 +- .../services/service/security/SecurityService.java | 11 +- .../i18n/pollen-services_en_GB.properties | 2 + .../i18n/pollen-services_fr_FR.properties | 2 + .../pollen/services/service/PollServiceTest.java | 4 +- pollen-ui-riot-js/package.json | 4 +- pollen-ui-riot-js/src/main/web/home/en.html | 6 +- pollen-ui-riot-js/src/main/web/home/fr.html | 6 +- pollen-ui-riot-js/src/main/web/homeCL/en.html | 6 +- pollen-ui-riot-js/src/main/web/homeCL/fr.html | 6 +- pollen-ui-riot-js/src/main/web/homeCL/offers.html | 6 +- pollen-ui-riot-js/src/main/web/index.js | 2 +- pollen-ui-riot-js/src/main/web/js/AuthService.js | 2 +- ...{FeedbackService.js => ConfigurationService.js} | 14 +- pollen-ui-riot-js/src/main/web/js/FetchService.js | 2 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 2 +- pollen-ui-riot-js/src/main/web/js/Session.js | 45 +-- .../src/main/web/tag/Authorization.tag.html | 69 ++++ .../src/main/web/tag/AvatarAction.tag.js | 20 + .../src/main/web/tag/LinkAction.tag.js | 20 + .../src/main/web/tag/PageChanged.tag.js | 7 + pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 437 +++++++++------------ .../src/main/web/tag/PollenHeader.tag.html | 35 +- .../src/main/web/tag/SignCheck.tag.html | 9 +- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 27 +- pollen-ui-riot-js/src/main/web/tag/SignUp.tag.html | 6 +- .../src/main/web/tag/SigninAction.tag.js | 27 ++ .../src/main/web/tag/UserProfile.tag.html | 8 +- .../web/tag/favoriteList/FavoriteList.tag.html | 8 +- .../favoriteList/FavoriteListEditModal.tag.html | 8 +- .../web/tag/favoriteList/ImportCsvModal.tag.html | 6 +- .../web/tag/favoriteList/ImportLdapModal.tag.html | 6 +- .../src/main/web/tag/poll/EditPoll.tag.html | 8 +- .../src/main/web/tag/poll/Poll.tag.html | 6 +- .../src/main/web/tag/poll/Polls.tag.html | 6 +- .../src/main/web/tag/poll/Summary.tag.html | 4 +- .../src/main/web/tag/voterList/VoterList.tag.html | 4 +- 62 files changed, 707 insertions(+), 401 deletions(-) create mode 100644 pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/exceptionMappers/PollenUserUnknownExceptionMapper.java create mode 100644 pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ConfigurationApi.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/ConfigurationBean.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/ConfigurationService.java copy pollen-services/src/main/java/org/chorem/pollen/services/service/security/{PollenUserBannedException.java => PollenUserUnknownException.java} (82%) copy pollen-ui-riot-js/src/main/web/js/{FeedbackService.js => ConfigurationService.js} (75%) create mode 100644 pollen-ui-riot-js/src/main/web/tag/Authorization.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/AvatarAction.tag.js create mode 100644 pollen-ui-riot-js/src/main/web/tag/LinkAction.tag.js create mode 100644 pollen-ui-riot-js/src/main/web/tag/PageChanged.tag.js create mode 100644 pollen-ui-riot-js/src/main/web/tag/SigninAction.tag.js -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/85-droits-utilisateurs created (now 8281c4c0)
by chorem.org scm 10 Oct '17

10 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/85-droits-utilisateurs in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 8281c4c0 ajout du type de bouton 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 (56c2b402 -> 8281c4c0)
by chorem.org scm 10 Oct '17

10 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 56c2b402 Borda : mise a jour du nombre de rangs si le nombre de choix change new 8281c4c0 ajout du type de bouton 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 8281c4c01da48cb61490313c512dbb32b5ef4702 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 10 16:54:57 2017 +0200 ajout du type de bouton Summary of changes: pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (55e0db1c -> 56c2b402)
by chorem.org scm 10 Oct '17

10 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 55e0db1c correction couleur des commentaires new 56c2b402 Borda : mise a jour du nombre de rangs si le nombre de choix change 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 56c2b402472427ce558501e603c1422b64ef03f7 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 10 16:25:22 2017 +0200 Borda : mise a jour du nombre de rangs si le nombre de choix change Summary of changes: .../src/main/web/tag/voteCountingType/BordaConfig.tag.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (7249b09f -> 55e0db1c)
by chorem.org scm 10 Oct '17

10 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 7249b09f correction de l'id de la resource pour les choix de type resource new 55e0db1c correction couleur des commentaires 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 55e0db1c5cb327404df05a175fa26eeda112ae1a Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 10 15:55:25 2017 +0200 correction couleur des commentaires Summary of changes: pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (3fe4ce2f -> 7249b09f)
by chorem.org scm 10 Oct '17

10 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 3fe4ce2f Merge branch 'feature/149-jugement-majoritaire' into develop new 7249b09f correction de l'id de la resource pour les choix de type resource 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 7249b09f0224a65820dec01eba009e1aff076893 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 10 15:52:22 2017 +0200 correction de l'id de la resource pour les choix de type resource Summary of changes: .../src/main/java/org/chorem/pollen/services/service/ChoiceService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (37204ee8 -> 3fe4ce2f)
by chorem.org scm 10 Oct '17

10 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 37204ee8 mise en page de la section avatar du profil adds 200e8231 implentation du jugement majoritaire (algo de dépouillement) ref #149 adds d989f50e Configuration du jugement majoritaire a l'edition du sondage ref #149 adds dd36bebb modification de l'écran de vote pour la jugement majoritaire ref #149 adds ddf81a43 modification de l'écran de résultat pour la jugement majoritaire ref #149 new 3fe4ce2f Merge branch 'feature/149-jugement-majoritaire' 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 3fe4ce2f39b7c47cda613e2edb07f927bb1b5d6c Merge: 37204ee8 ddf81a43 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 10 15:26:25 2017 +0200 Merge branch 'feature/149-jugement-majoritaire' into develop Summary of changes: .../converter/VoteCountingConfigDeserializer.java | 17 + pollen-services/pom.xml | 5 + .../pollen/services/bean/VoteCountingTypeBean.java | 4 + .../voteCounting/VoteCountingDetailResultBean.java | 8 + .../MajorityJudgmentChoiceResultBean.java | 62 ++++ .../MajorityJudgmentDetailResultBean.java | 58 ++++ pollen-ui-riot-js/src/main/web/i18n/en.json | 8 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 8 + pollen-ui-riot-js/src/main/web/js/Poll.js | 6 +- .../src/main/web/tag/poll/Results.tag.html | 16 +- .../src/main/web/tag/poll/Settings.tag.html | 5 + .../src/main/web/tag/poll/Votes.tag.html | 40 ++- .../MajorityJudgmentConfig.tag.html | 84 +++++ .../MajorityJudgmentDetailResult.tag.html | 222 ++++++++++++++ pollen-votecounting-aggregator/pom.xml | 6 + .../votecounting/model/ChoiceToVoteRenderType.java | 5 +- .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 6 +- .../votecounting/MajorityJudgmentChoiceResult.java | 43 +++ .../votecounting/MajorityJudgmentConfig.java | 21 ++ .../votecounting/MajorityJudgmentDetailResult.java | 39 ++- .../votecounting/MajorityJudgmentVoteCounting.java | 36 +-- .../MajorityJudgmentVoteCountingStrategy.java | 264 ++++++++++++++++ .../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 30 files changed, 1271 insertions(+), 49 deletions(-) create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/voteCounting/majorityJugment/MajorityJudgmentChoiceResultBean.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/voteCounting/majorityJugment/MajorityJudgmentDetailResultBean.java create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/MajorityJudgmentConfig.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/MajorityJudgmentDetailResult.tag.html 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 (68%) 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