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@chorem.org>.