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 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 new 3f4c675f fixes #28 Avatar 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 3f4c675f0737e5e43fbda1cf520e725b12bbfe89 Merge: a59ea622 d7f90355 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 2 16:13:12 2017 +0200 fixes #28 Avatar for the users Summary of changes: .../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 | 18 +- .../services/service/security/SecurityService.java | 10 + pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 4 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 6 + pollen-ui-riot-js/src/main/web/js/FetchService.js | 1 - .../src/main/web/js/ResourceService.js | 13 +- 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 | 2 +- .../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 | 3 +- .../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 +- 48 files changed, 781 insertions(+), 391 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>.