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 a04e635a refs #28 forumlaire d'upload de l'avatar omits f0692bd5 refs #28 finalement on stocke l'avatar dans une resource en base meme quand ça vient d'un tiers omits 95718ac2 refs #28 message si avatar non chargé omits c7550c51 refs #28 ajout de l'avatar pour l'utilisateur + possibilité d'en choisir un parmi les providers disponibles adds aa1b84a5 Correction affichage votes anoymes adds 053f9ed8 fixes #146 The registration form does not display on mobiles adds a1227dbd logout en delete et oubli de mot de passe en post adds 80d82627 Corretion de la methode pour les votes alternatifs adds 9913fcb0 update gitlab ci for release adds d9f7d087 update gitlab ci for release adds 9366dcba update gitlab ci for release adds 26842f63 update gitlab ci for release adds 92897a30 update gitlab ci for release adds edaa1be6 fixes #150 bouchage des trous de secu adds 72199763 Maj des dépendances et entêtes en vue de la release. adds 66b90103 update gitlab ci for release adds 02a5af9d ajout de l'url de voe à partager dans la page de résumé du sondage + warning pour ne pas partager la page de résumé adds 6e45bf56 ajout d'un tooltip sur le bouton copier + suppression du warning adds 863823eb style adds 791e3415 update gitlab ci for release adds d8b73ea2 update gitlab ci for release adds 846d7878 update gitlab ci for release adds 7c572986 update gitlab ci for release adds 037a7157 update gitlab ci for release adds 3fe11b0b update gitlab ci for release adds fb0d5b02 update gitlab ci for release adds 29e6854a update gitlab ci for release adds 57cf8c08 update gitlab ci for release adds cc88f3f3 Update .gitlab-ci.yml adds a954f3f5 Update .gitlab-ci.yml adds c9a24a48 release 3.0.0 success [skip ci] adds 3afb5b13 release 3.0.0 success [skip ci] adds 66af7606 Update .gitlab-ci.yml adds 628af107 release 3.0.0 success [skip ci] adds 7ce8b58d Update .gitlab-ci.yml adds 9f9d925f suppression d'un mauvais nom de domaine adds 4ed8e91e Empty CHANGELOG adds 3b0a0e98 release 3.0.0 success [skip ci] adds bd177f18 Update .gitlab-ci.yml adds 34698a83 Update CHANGELOG adds f5608178 release 3.0.0 success [skip ci] adds bdf3b65c Merge branch 'release/3.0.0' adds 50cd29bb Merge tag '3.0.0' into develop new 13096a6c refs #28 ajout de l'avatar pour l'utilisateur + possibilité d'en choisir un parmi les providers disponibles new 7d02cf80 refs #28 message si avatar non chargé new 8c8503c4 refs #28 finalement on stocke l'avatar dans une resource en base meme quand ça vient d'un tiers new c0153a85 refs #28 forumlaire d'upload de l'avatar new a9ba220a refs #28 utilisation de l'avatar new 350108b4 ajout e variable dans le package.json 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 (a04e635a) \ N -- N -- N refs/heads/feature/28_avatars (350108b4) 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 6 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 350108b48a96f0a707008da0f8d2d78aa21aaf9c Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 29 10:02:28 2017 +0200 ajout e variable dans le package.json commit a9ba220a76c759a9daf6527930fb88fb6156245d Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 28 11:12:43 2017 +0200 refs #28 utilisation de l'avatar commit c0153a8599aeab4c0b35f79cc3f449fdc978a26e Author: Kevin Morin <morin@codelutin.com> Date: Tue Sep 26 10:55:28 2017 +0200 refs #28 forumlaire d'upload de l'avatar commit 8c8503c4e5c11165e7efbddf4a9991f12d788d39 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 7d02cf80f1d8d04bb993e4931c9e38516db75189 Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 22 10:39:10 2017 +0200 refs #28 message si avatar non chargé commit 13096a6c8b30e8effc6f070c3776b0ab430bb917 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: .gitlab-ci.yml | 73 ++++++++++++++++++ CHANGELOG | 23 ++++++ pollen-persistence/pom.xml | 2 +- .../org/chorem/pollen/persistence/DaoUtils.java | 21 ++++++ .../persistence/PollenFlywayServiceImpl.java | 21 ++++++ .../entity/ChildFavoriteListTopiaDao.java | 23 +++++- .../entity/FavoriteListMemberTopiaDao.java | 21 ++++++ .../pollen/persistence/entity/PollenUserImpl.java | 21 ++++++ .../pollen/persistence/entity/ReportResume.java | 21 ++++++ .../pollen/persistence/entity/ReportTopiaDao.java | 21 ++++++ .../persistence/entity/UserCredentialTopiaDao.java | 27 ++++++- .../entity/VoterListMemberTopiaDao.java | 21 ++++++ pollen-rest-api/pom.xml | 7 +- pollen-rest-api/src/license/THIRD-PARTY.properties | 28 ++++--- .../pollen/rest/api/PollenRestApiApplication.java | 21 ++++++ .../pollen/rest/api/beans/ChangePasswordBean.java | 23 +++++- .../pollen/rest/api/beans/PollCreateBean.java | 21 ++++++ .../pollen/rest/api/beans/Resource64Bean.java | 21 ++++++ .../pollen/rest/api/beans/VoterListSaveBean.java | 21 ++++++ .../pollen/rest/api/converter/JacksonConfig.java | 21 ++++++ .../api/converter/PollenConverterProvider.java | 21 ++++++ .../api/converter/PollenEntityIdDeserializer.java | 21 ++++++ .../api/converter/PollenEntityIdSerializer.java | 21 ++++++ .../api/converter/PollenEntityRefDeserializer.java | 21 ++++++ .../api/converter/PollenEntityRefSerializer.java | 21 ++++++ .../FavoriteListImportExceptionMapper.java | 21 ++++++ .../InvalidEntityLinkExceptionMapper.java | 21 ++++++ .../InvalidFormExceptionMapper.java | 21 ++++++ .../PollenAbstractExceptionMapper.java | 21 ++++++ .../PollenAuthenticationExceptionMapper.java | 21 ++++++ .../PollenEmailNotValidatedExceptionMapper.java | 21 ++++++ ...rProviderAccountAlreadyUsedExceptionMapper.java | 21 ++++++ ...InvalidEmailActivationTokenExceptionMapper.java | 21 ++++++ .../PollenInvalidPermissionExceptionMapper.java | 21 ++++++ .../PollenInvalidSessionTokenExceptionMapper.java | 21 ++++++ .../PollenUnauthorizedExceptionMapper.java | 21 ++++++ .../PollenUserBannedExceptionMapper.java | 21 ++++++ .../TopiaNoResultExceptionMapper.java | 21 ++++++ .../org/chorem/pollen/rest/api/v1/ApiUtils.java | 21 ++++++ .../org/chorem/pollen/rest/api/v1/AuthApi.java | 8 +- .../org/chorem/pollen/rest/api/v1/FeedbackApi.java | 21 ++++++ .../java/org/chorem/pollen/rest/api/v1/GtuApi.java | 21 ++++++ .../pollen/rest/api/v1/PollenResourceApi.java | 15 ---- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 3 +- .../chorem/pollen/rest/api/v1/VoterListApi.java | 13 ---- .../org/chorem/pollen/rest/api/AuthApiTest.java | 2 +- pollen-services/pom.xml | 2 +- .../chorem/pollen/services/PollenUIContext.java | 21 ++++++ .../java/org/chorem/pollen/services/UnitHuman.java | 21 ++++++ .../services/bean/ChildFavoriteListBean.java | 21 ++++++ .../chorem/pollen/services/bean/FeedbackBean.java | 21 ++++++ .../pollen/services/bean/LoginProviderBean.java | 21 ++++++ .../org/chorem/pollen/services/bean/PollBean.java | 13 ++++ .../chorem/pollen/services/bean/ReportBean.java | 21 ++++++ .../chorem/pollen/services/bean/ReportLevel.java | 21 ++++++ .../pollen/services/bean/ReportResumeBean.java | 21 ++++++ .../pollen/services/bean/UserCredentialBean.java | 21 ++++++ .../bean/export/ChildFavoriteListExport.java | 21 ++++++ .../pollen/services/bean/export/ExportBean.java | 21 ++++++ .../services/bean/export/FavoriteListsExport.java | 21 ++++++ .../pollen/services/bean/resource/GtuMetaBean.java | 21 ++++++ .../services/bean/resource/ResourceMetaBean.java | 2 +- .../Coombs/CoombsDetailResultBean.java | 21 ++++++ .../bean/voteCounting/Coombs/CoombsRoundBean.java | 21 ++++++ .../voteCounting/Coombs/CoombsRoundChoiceBean.java | 21 ++++++ .../InstantRunoffDetailResultBean.java | 21 ++++++ .../InstantRunoff/InstantRunoffRoundBean.java | 21 ++++++ .../InstantRunoffRoundChoiceBean.java | 21 ++++++ .../voteCounting/VoteCountingDetailResultBean.java | 21 ++++++ .../voteCounting/borda/BordaChoiceRankBean.java | 21 ++++++ .../voteCounting/borda/BordaDetailResultBean.java | 21 ++++++ .../condorcet/CondorcetBattleBean.java | 21 ++++++ .../condorcet/CondorcetDetailResultBean.java | 21 ++++++ .../pollen/services/job/AbstractPollenJob.java | 21 ++++++ .../pollen/services/job/SendEmailInErrorsJob.java | 21 ++++++ .../services/job/SendPollEndReminderJob.java | 21 ++++++ .../pollen/services/service/ChoiceService.java | 1 + .../services/service/FavoriteListService.java | 77 +++++++------------ .../pollen/services/service/FeedService.java | 21 ++++++ .../pollen/services/service/FeedbackService.java | 21 ++++++ .../chorem/pollen/services/service/GtuService.java | 28 ++++++- .../pollen/services/service/PollService.java | 20 ++--- .../services/service/PollenResourceService.java | 19 +---- .../services/service/PollenServiceSupport.java | 5 ++ .../pollen/services/service/PollenUserService.java | 22 +++--- .../pollen/services/service/ReportService.java | 21 ++++++ .../pollen/services/service/SocialAuthService.java | 33 ++++++-- .../services/service/VoteCountingService.java | 1 + .../services/service/mail/AbstractReportEmail.java | 21 ++++++ .../service/mail/AbstractReportForAdminEmail.java | 21 ++++++ .../services/service/mail/ChoiceReportEmail.java | 21 ++++++ .../service/mail/ChoiceReportForAdminEmail.java | 21 ++++++ .../services/service/mail/CommentReportEmail.java | 21 ++++++ .../service/mail/CommentReportForAdminEmail.java | 21 ++++++ .../services/service/mail/FeedbackEmail.java | 21 ++++++ .../services/service/mail/PollReportEmail.java | 21 ++++++ .../service/mail/PollReportForAdminEmail.java | 21 ++++++ ...EmailOrProviderAccountAlreadyUsedException.java | 21 ++++++ .../src/main/resources/oauth_consumer.properties | 22 +++++- .../pollen/services/service/PollServiceTest.java | 2 +- pollen-ui-riot-js/package.json | 2 +- .../jetty-context.xml => pollen-ui-riot-js/pom.xml | 23 ++++-- pollen-ui-riot-js/src/main/web/conf.js | 20 +++++ pollen-ui-riot-js/src/main/web/css/blaze.css | 20 +++++ .../src/main/web/css/custom-code-lutin.css | 20 +++++ pollen-ui-riot-js/src/main/web/css/custom.css | 20 +++++ pollen-ui-riot-js/src/main/web/css/main.css | 1 + pollen-ui-riot-js/src/main/web/css/print.css | 22 +++++- .../src/main/web/help/voteCountingTypes-en.html | 22 +++++- .../src/main/web/help/voteCountingTypes-fr.html | 22 +++++- pollen-ui-riot-js/src/main/web/home/en.html | 22 +++++- pollen-ui-riot-js/src/main/web/home/fr.html | 22 +++++- pollen-ui-riot-js/src/main/web/home/style.css | 22 +++++- pollen-ui-riot-js/src/main/web/homeCL/en.html | 22 +++++- pollen-ui-riot-js/src/main/web/homeCL/fr.html | 22 +++++- pollen-ui-riot-js/src/main/web/homeCL/offers.html | 22 +++++- pollen-ui-riot-js/src/main/web/homeCL/style.css | 22 +++++- pollen-ui-riot-js/src/main/web/i18n/en.json | 2 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 2 + pollen-ui-riot-js/src/main/web/js/AuthService.js | 4 +- pollen-ui-riot-js/src/main/web/js/Logger.js | 20 +++++ pollen-ui-riot-js/src/main/web/js/PageTracker.js | 20 +++++ pollen-ui-riot-js/src/main/web/js/Pagination.js | 20 +++++ pollen-ui-riot-js/src/main/web/js/Poll.js | 20 +++++ pollen-ui-riot-js/src/main/web/js/PollenBus.js | 20 +++++ .../src/main/web/js/ResourceService.js | 4 + pollen-ui-riot-js/src/main/web/js/UIHelper.js | 20 +++++ pollen-ui-riot-js/src/main/web/js/UserService.js | 2 +- .../src/main/web/js/VoterListService.js | 20 +++++ .../src/main/web/tag/HeaderI18n.tag.html | 36 ++++----- pollen-ui-riot-js/src/main/web/tag/Home.tag.html | 36 ++++----- .../src/main/web/tag/Pagination.tag.html | 20 +++++ pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 48 +++++++----- .../src/main/web/tag/PollenFooter.tag.html | 36 ++++----- .../src/main/web/tag/PollenHeader.tag.html | 40 +++++----- .../src/main/web/tag/PollenMessageManager.tag.html | 20 +++++ .../src/main/web/tag/PollenWaiter.tag.html | 20 +++++ .../src/main/web/tag/Privacy.tag.html | 20 +++++ pollen-ui-riot-js/src/main/web/tag/QrCode.tag.html | 20 +++++ .../src/main/web/tag/SignCheck.tag.html | 36 ++++----- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 40 +++++----- pollen-ui-riot-js/src/main/web/tag/SignUp.tag.html | 43 ++++++----- .../src/main/web/tag/UserProfile.tag.html | 38 ++++++++-- .../src/main/web/tag/admin/GtuCard.tag.html | 20 +++++ .../src/main/web/tag/admin/Gtus.tag.html | 20 +++++ .../src/main/web/tag/admin/LoginProviders.tag.html | 20 +++++ .../src/main/web/tag/admin/UserCard.tag.html | 20 +++++ .../src/main/web/tag/admin/UserEditModal.tag.html | 20 +++++ .../src/main/web/tag/admin/Users.tag.html | 20 +++++ .../src/main/web/tag/components/Avatar.tag.html | 36 +++++++++ .../src/main/web/tag/components/Card.tag.html | 20 +++++ .../src/main/web/tag/components/Checkbox.tag.html | 22 +++++- .../web/tag/components/ContextualMenu.tag.html | 20 +++++ .../main/web/tag/components/GtuValidation.tag.html | 20 +++++ .../main/web/tag/components/HumanInput.tag.html | 20 +++++ .../src/main/web/tag/components/LazyLoad.tag.html | 20 +++++ .../main/web/tag/components/LetterAvatar.tag.html | 20 +++++ .../main/web/tag/components/LoadingCard.tag.html | 20 +++++ .../web/tag/components/MultiLineLabel.tag.html | 22 +++++- .../src/main/web/tag/components/Search.tag.html | 20 +++++ .../main/web/tag/components/date-picker.tag.html | 20 +++++ .../web/tag/components/date-time-picker.tag.html | 20 +++++ .../main/web/tag/components/time-picker.tag.html | 20 +++++ .../web/tag/favoriteList/ChildListCard.tag.html | 20 +++++ .../tag/favoriteList/ChildListEditModal.tag.html | 20 +++++ .../web/tag/favoriteList/FavoriteList.tag.html | 22 +++++- .../web/tag/favoriteList/FavoriteListCard.tag.html | 20 +++++ .../favoriteList/FavoriteListEditModal.tag.html | 20 +++++ .../web/tag/favoriteList/FavoriteLists.tag.html | 20 +++++ .../web/tag/favoriteList/ImportCsvModal.tag.html | 20 +++++ .../web/tag/favoriteList/ImportLdapModal.tag.html | 20 +++++ .../main/web/tag/favoriteList/MemberCard.tag.html | 20 +++++ .../web/tag/favoriteList/MemberEditModal.tag.html | 20 +++++ .../src/main/web/tag/poll/Choice.tag.html | 23 +++++- .../src/main/web/tag/poll/ChoiceView.tag.html | 26 ++++++- .../src/main/web/tag/poll/Choices.tag.html | 20 +++++ .../src/main/web/tag/poll/Comments.tag.html | 20 +++++ .../src/main/web/tag/poll/Description.tag.html | 36 ++++----- .../src/main/web/tag/poll/EditPoll.tag.html | 36 ++++----- .../src/main/web/tag/poll/Podium.tag.html | 20 +++++ .../src/main/web/tag/poll/Poll.tag.html | 20 +++++ .../src/main/web/tag/poll/PollCard.tag.html | 23 +++++- .../src/main/web/tag/poll/Polls.tag.html | 20 +++++ .../src/main/web/tag/poll/Report.tag.html | 20 +++++ .../src/main/web/tag/poll/Results.tag.html | 20 +++++ .../src/main/web/tag/poll/Settings.tag.html | 36 ++++----- .../src/main/web/tag/poll/Summary.tag.html | 78 ++++++++++++++++--- .../src/main/web/tag/poll/Votes.tag.html | 25 +++++- .../src/main/web/tag/popup/ConfirmPopup.tag.html | 20 +++++ .../src/main/web/tag/popup/FeedbackModal.tag.html | 20 +++++ .../src/main/web/tag/popup/GtuChangeModal.tag.html | 36 ++++----- .../main/web/tag/popup/InformationPopup.tag.html | 20 +++++ .../src/main/web/tag/popup/Modal.tag.html | 20 +++++ .../src/main/web/tag/popup/NewPassword.tag.html | 36 ++++----- .../src/main/web/tag/popup/QrCodeButton.tag.html | 20 +++++ .../main/web/tag/popup/ResendValidation.tag.html | 36 ++++----- .../voteCountingType/BordaDetailResult.tag.html | 20 +++++ .../CondorcetDetailResult.tag.html | 20 +++++ .../voteCountingType/CoombsDetailResult.tag.html | 20 +++++ .../InstantRunoffDetailResult.tag.html | 20 +++++ .../tag/voterList/ImportFavoritListModal.tag.html | 20 +++++ .../src/main/web/tag/voterList/VoterList.tag.html | 20 +++++ .../main/web/tag/voterList/VoterListCard.tag.html | 20 +++++ .../web/tag/voterList/VoterListEditModal.tag.html | 20 +++++ .../web/tag/voterList/VoterListMemberCard.tag.html | 20 +++++ .../voterList/VoterListMemberEditModal.tag.html | 20 +++++ pollen-ui-riot-js/webpack.config.js | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- .../model/VoteCountingDetailResult.java | 21 ++++++ pollen-votecounting-borda/pom.xml | 2 +- .../pollen/votecounting/BordaChoiceRank.java | 21 ++++++ .../pollen/votecounting/BordaDetailResult.java | 21 ++++++ pollen-votecounting-condorcet/pom.xml | 2 +- .../pollen/votecounting/CondorcetBattle.java | 21 ++++++ .../pollen/votecounting/CondorcetDetailResult.java | 21 ++++++ pollen-votecounting-coombs/pom.xml | 2 +- .../pollen/votecounting/CoombsDetailResult.java | 21 ++++++ .../chorem/pollen/votecounting/CoombsRound.java | 21 ++++++ .../pollen/votecounting/CoombsRoundChoice.java | 21 ++++++ pollen-votecounting-instant-runoff/pom.xml | 2 +- .../votecounting/InstantRunoffDetailResult.java | 21 ++++++ .../pollen/votecounting/InstantRunoffRound.java | 21 ++++++ .../votecounting/InstantRunoffRoundChoice.java | 21 ++++++ .../InstantRunoffVoteCountingStrategy.java | 6 +- .../InstantRunoffVoteCountingStrategyTest.java | 29 ++++--- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 88 +++++++++++++++------- 230 files changed, 4283 insertions(+), 504 deletions(-) create mode 100644 CHANGELOG copy pollen-rest-api/src/jetty/jetty-context.xml => pollen-ui-riot-js/pom.xml (58%) 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@chorem.org>.