This is an automated email from the git hooks/post-receive script. New change to branch feature/28_avatars in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git omits 350108b4 ajout e variable dans le package.json omits a9ba220a refs #28 utilisation de l'avatar omits c0153a85 refs #28 forumlaire d'upload de l'avatar omits 8c8503c4 refs #28 finalement on stocke l'avatar dans une resource en base meme quand ça vient d'un tiers omits 7d02cf80 refs #28 message si avatar non chargé omits 13096a6c refs #28 ajout de l'avatar pour l'utilisateur + possibilité d'en choisir un parmi les providers disponibles adds 91d1a280 passage à la version 3.1.0-SNAPSHOT adds 3efc4383 passage à la version 3.1.0 pour le js adds 8ab5eda8 correction du footer en anglais adds a774bbd8 Limitations du nombre votants (ref #58), Déplacement des méthodes de transformation des entités en bean dans les services adds 6b46dc9a indiquer la limite de votants pour un sondage (ref #58) adds bf74bb03 ne pas afficher les votes ignorés (ref #58) adds 9ba5ccb2 Dans les listes des sondages : voir les sondage hors limites du nombre de votants (ref #58) adds 5cd67c81 Création et modification d'un sondage restreint, avertir si le nombre de participant dépasse le nombre maximum de votants (ref #58) adds 9f142759 envoyer un mail quand le nombre de votants dépasse la valeur max (ref #58) adds a59ea622 Merge branch 'feature/58-limitation-des-votants' into develop new 9b760b6e refs #28 ajout de l'avatar pour l'utilisateur + possibilité d'en choisir un parmi les providers disponibles new 47dd3508 refs #28 message si avatar non chargé new 9caec977 refs #28 finalement on stocke l'avatar dans une resource en base meme quand ça vient d'un tiers new d1e7140e refs #28 forumlaire d'upload de l'avatar new 16c884e0 refs #28 utilisation de l'avatar new 0b084777 ajout e variable dans le package.json new 24e6ad02 rebase 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 (350108b4) \ N -- N -- N refs/heads/feature/28_avatars (24e6ad02) 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 7 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 24e6ad02ac0ead09b2d055f551f32bcc7c94b723 Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 29 11:37:16 2017 +0200 rebase commit 0b0847773d28b33d3f335a57b42e2c788011d9de Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 29 10:02:28 2017 +0200 ajout e variable dans le package.json commit 16c884e01c8cbead7aaf4c8e2bee6d01fdbd578b Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 28 11:12:43 2017 +0200 refs #28 utilisation de l'avatar commit d1e7140e8550cec3c833305d93de37a8e085768d Author: Kevin Morin <morin@codelutin.com> Date: Tue Sep 26 10:55:28 2017 +0200 refs #28 forumlaire d'upload de l'avatar commit 9caec9779a14f73cb004f551f9a8bc138da298c6 Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 22 17:42:51 2017 +0200 refs #28 finalement on stocke l'avatar dans une resource en base meme quand ça vient d'un tiers commit 47dd3508f0a2309a4be61a6098b72a14673d475a Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 22 10:39:10 2017 +0200 refs #28 message si avatar non chargé commit 9b760b6ec8ce7bd2f9ae40ee98071fe32e86c597 Author: Kevin Morin <morin@codelutin.com> Date: Tue Sep 19 18:10:32 2017 +0200 refs #28 ajout de l'avatar pour l'utilisateur + possibilité d'en choisir un parmi les providers disponibles Summary of changes: pollen-persistence/pom.xml | 2 +- .../pollen/persistence/entity/PollTopiaDao.java | 12 ++ .../pollen/persistence/entity/VoteToChoices.java | 15 +- .../pollen/persistence/entity/VoteTopiaDao.java | 11 ++ .../db/migration/h2/V3_1_0_1__add_premium.sql | 8 + ..._2__add_avatar.sql => V3_1_0_2__add_avatar.sql} | 0 .../migration/postgresql/V3_1_0_1__add_premium.sql | 8 + ..._2__add_avatar.sql => V3_1_0_2__add_avatar.sql} | 0 pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 28921 -> 29157 bytes pollen-rest-api/pom.xml | 2 +- .../org/chorem/pollen/rest/api/AuthApiTest.java | 8 +- .../chorem/pollen/rest/api/PollenUserApiTest.java | 2 +- pollen-services/pom.xml | 2 +- pollen-services/src/main/config/PollenServices.ini | 8 +- .../chorem/pollen/services/PollenUIContext.java | 10 ++ .../services/bean/ChildFavoriteListBean.java | 23 --- .../chorem/pollen/services/bean/ChoiceBean.java | 29 ---- .../chorem/pollen/services/bean/CommentBean.java | 44 ------ .../pollen/services/bean/FavoriteListBean.java | 20 --- .../services/bean/FavoriteListMemberBean.java | 24 --- .../pollen/services/bean/LoginProviderBean.java | 23 --- .../org/chorem/pollen/services/bean/PollBean.java | 133 ++-------------- .../chorem/pollen/services/bean/PollenBean.java | 4 - .../chorem/pollen/services/bean/PollenBeans.java | 49 +----- .../pollen/services/bean/PollenUserBean.java | 66 +++----- .../chorem/pollen/services/bean/ReportBean.java | 21 --- .../pollen/services/bean/UserCredentialBean.java | 21 +-- .../org/chorem/pollen/services/bean/VoteBean.java | 80 ++-------- .../pollen/services/bean/VoteToChoiceBean.java | 24 --- .../chorem/pollen/services/bean/VoterListBean.java | 36 ++--- .../pollen/services/bean/VoterListMemberBean.java | 34 ----- .../bean/export/ChildFavoriteListExport.java | 16 -- .../bean/resource/AbstractResourceBean.java | 27 +--- .../services/bean/resource/ResourceFileBean.java | 46 +++--- .../services/bean/resource/ResourceMetaBean.java | 12 +- .../services/bean/resource/ResourceStreamBean.java | 34 +---- .../pollen/services/service/ChoiceService.java | 57 ++++--- .../pollen/services/service/CommentService.java | 45 ++++-- .../services/service/FavoriteListService.java | 73 ++++++--- .../pollen/services/service/FeedbackService.java | 3 +- .../pollen/services/service/FixturesService.java | 14 +- .../chorem/pollen/services/service/GtuService.java | 50 +++--- .../services/service/NotificationService.java | 9 ++ .../pollen/services/service/PollService.java | 168 +++++++++++++++------ .../services/service/PollenResourceService.java | 50 ++++-- .../services/service/PollenServiceSupport.java | 43 +----- .../pollen/services/service/PollenUserService.java | 127 +++++++++------- .../pollen/services/service/ReportService.java | 30 +++- .../pollen/services/service/SocialAuthService.java | 17 ++- .../services/service/VoteCountingService.java | 13 +- .../pollen/services/service/VoteService.java | 104 +++++++++---- .../pollen/services/service/VoterListService.java | 89 ++++++----- .../pollen/services/service/mail/EmailService.java | 8 + ...atedEmail.java => ExceedingMaxVotersEmail.java} | 29 ++-- .../email/ExceedingMaxVotersEmail.mustache | 5 + .../email/ExceedingMaxVotersEmail_fr.mustache | 6 + .../i18n/pollen-services_en_GB.properties | 2 + .../i18n/pollen-services_fr_FR.properties | 2 + .../services/service/PollenUserServiceTest.java | 8 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-ui-riot-js/src/main/web/css/custom.css | 6 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 13 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 11 +- pollen-ui-riot-js/src/main/web/js/Session.js | 3 +- .../src/main/web/js/VoterListService.js | 25 ++- .../src/main/web/tag/UserProfile.tag.html | 1 + .../src/main/web/tag/admin/UserCard.tag.html | 16 ++ .../src/main/web/tag/admin/UserEditModal.tag.html | 19 +++ .../src/main/web/tag/components/InnerHtml.tag.html | 14 ++ .../main/web/tag/components/date-picker.tag.html | 13 +- .../src/main/web/tag/poll/Poll.tag.html | 34 ++++- .../src/main/web/tag/poll/PollCard.tag.html | 26 +++- .../src/main/web/tag/poll/Votes.tag.html | 29 +++- .../src/main/web/tag/voterList/VoterList.tag.html | 17 ++- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 86 files changed, 1010 insertions(+), 1049 deletions(-) create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_1_0_1__add_premium.sql rename pollen-persistence/src/main/resources/db/migration/h2/{V3_0_1_2__add_avatar.sql => V3_1_0_2__add_avatar.sql} (100%) create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_1_0_1__add_premium.sql rename pollen-persistence/src/main/resources/db/migration/postgresql/{V3_0_1_2__add_avatar.sql => V3_1_0_2__add_avatar.sql} (100%) copy pollen-services/src/main/java/org/chorem/pollen/services/service/mail/{PollCreatedEmail.java => ExceedingMaxVotersEmail.java} (69%) create mode 100644 pollen-services/src/main/resources/email/ExceedingMaxVotersEmail.mustache create mode 100644 pollen-services/src/main/resources/email/ExceedingMaxVotersEmail_fr.mustache create mode 100644 pollen-ui-riot-js/src/main/web/tag/components/InnerHtml.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.