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

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

branch feature/151_desinscription created (now 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 feature/151_desinscription in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 17348adb fixes #151 I cannot delete my account This branch includes the following new commits: new 17348adb fixes #151 I cannot delete my account 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 17348adb627161ed79d7613d5da7cce332e65d87 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 3 10:57:21 2017 +0200 fixes #151 I cannot delete my account -- 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 (a59ea622 -> 4e17e544)
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 feature/148-configuration-methodes-de-votes in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from a59ea622 Merge branch 'feature/58-limitation-des-votants' into develop adds 9b760b6e refs #28 ajout de l'avatar pour l'utilisateur + possibilité d'en choisir un parmi les providers disponibles adds 47dd3508 refs #28 message si avatar non chargé adds 9caec977 refs #28 finalement on stocke l'avatar dans une resource en base meme quand ça vient d'un tiers adds d1e7140e refs #28 forumlaire d'upload de l'avatar adds 16c884e0 refs #28 utilisation de l'avatar adds 0b084777 ajout e variable dans le package.json adds 24e6ad02 rebase adds d7f90355 refs #28 utilisation des avatars un peu partout + verif de la taille et du type de fichier pour l'avatar adds 3f4c675f fixes #28 Avatar for the users adds c9e1e9ab Passage en version 3.0.1 adds ff9fe24e Correction des traductions adds 45e53c95 correction du pattern vide du choix adds bf5ac4c4 fixes #156 I cannot edit my vote in a restricted poll adds 567aa0d1 fixes #154 The icons to log in through 3rd party providers do not display if I want to log in after my token expires adds ca08eafd réaffichage de la page après la connexion adds b1ba1d22 correction vote pour un sondage restreint par le créateur connecté avec le token d'un autre invité adds 41342262 update changlog adds 4e17e544 Merge tag '3.0.1' into develop No new revisions were added by this update. Summary of changes: CHANGELOG | 6 + .../persistence/entity/PollenResourceTopiaDao.java | 12 + .../db/migration/h2/V3_1_0_2__add_avatar.sql | 3 + .../migration/postgresql/V3_1_0_2__add_avatar.sql | 3 + pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 28560 -> 29157 bytes .../org/chorem/pollen/rest/api/v1/ApiUtils.java | 2 +- .../org/chorem/pollen/rest/api/v1/AuthApi.java | 1 + .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 2 +- .../java/org/chorem/pollen/rest/api/v1/GtuApi.java | 4 +- .../pollen/rest/api/v1/PollenResourceApi.java | 13 +- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 46 +++ .../chorem/pollen/services/bean/CommentBean.java | 10 + .../org/chorem/pollen/services/bean/PollBean.java | 11 + .../pollen/services/bean/PollenUserBean.java | 10 + .../pollen/services/bean/ResourceMetaBean.java | 89 ----- .../org/chorem/pollen/services/bean/VoteBean.java | 10 + .../bean/resource/AbstractResourceBean.java | 59 ++++ .../services/bean/{ => resource}/GtuMetaBean.java | 2 +- .../bean/{ => resource}/ResourceFileBean.java | 69 ++-- .../resource/ResourceMetaBean.java} | 32 +- .../bean/{ => resource}/ResourceStreamBean.java | 44 +-- .../pollen/services/service/ChoiceService.java | 1 - .../pollen/services/service/CommentService.java | 17 +- .../chorem/pollen/services/service/GtuService.java | 4 +- .../pollen/services/service/PollService.java | 19 +- .../services/service/PollenResourceService.java | 54 ++- .../services/service/PollenServiceSupport.java | 4 + .../pollen/services/service/PollenUserService.java | 41 ++- .../pollen/services/service/SocialAuthService.java | 32 +- .../pollen/services/service/VoteService.java | 111 ++++-- .../services/service/security/SecurityService.java | 42 ++- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 6 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 10 +- pollen-ui-riot-js/src/main/web/js/FetchService.js | 1 - pollen-ui-riot-js/src/main/web/js/Poll.js | 44 ++- .../src/main/web/js/ResourceService.js | 13 +- pollen-ui-riot-js/src/main/web/js/Session.js | 2 + pollen-ui-riot-js/src/main/web/js/UserService.js | 19 + pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 28 +- .../src/main/web/tag/PollenHeader.tag.html | 9 +- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 15 +- .../src/main/web/tag/UserProfile.tag.html | 390 ++++++++++++++------- .../src/main/web/tag/components/Avatar.tag.html | 29 ++ .../web/tag/favoriteList/FavoriteList.tag.html | 2 - .../src/main/web/tag/poll/Choice.tag.html | 5 +- .../src/main/web/tag/poll/ChoiceView.tag.html | 6 +- .../src/main/web/tag/poll/Comments.tag.html | 7 +- .../src/main/web/tag/poll/PollCard.tag.html | 12 +- .../src/main/web/tag/poll/Votes.tag.html | 15 +- 51 files changed, 920 insertions(+), 450 deletions(-) create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_1_0_2__add_avatar.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_1_0_2__add_avatar.sql delete mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceMetaBean.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/resource/AbstractResourceBean.java rename pollen-services/src/main/java/org/chorem/pollen/services/bean/{ => resource}/GtuMetaBean.java (95%) rename pollen-services/src/main/java/org/chorem/pollen/services/bean/{ => resource}/ResourceFileBean.java (54%) copy pollen-services/src/main/java/org/chorem/pollen/services/{service/InvalidFormException.java => bean/resource/ResourceMetaBean.java} (58%) rename pollen-services/src/main/java/org/chorem/pollen/services/bean/{ => resource}/ResourceStreamBean.java (64%) create mode 100644 pollen-ui-riot-js/src/main/web/tag/components/Avatar.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

annotated tag pollen-3.0.0-beta-1 created (now 0e2f4c2c)
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 annotated tag pollen-3.0.0-beta-1 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 0e2f4c2c (tag) tagging f98f087e7b5484afa8032536b4195af46bd24db5 (commit) replaces pollen-3.0-beta-1 tagged by Sylvain Bavencoff on Thu Mar 30 17:39:45 2017 +0200 - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- 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

annotated tag pollen-3.0-beta-1 created (now 81cc38bd)
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 annotated tag pollen-3.0-beta-1 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 81cc38bd (tag) tagging d143ba0b8025eb750152ebb4a7e26ed1e770b54a (commit) replaces pollen-2.0-alpha-3 tagged by Sylvain Bavencoff on Thu Mar 30 15:52:26 2017 +0200 - Log ----------------------------------------------------------------- Refactor UI ----------------------------------------------------------------------- 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