This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git 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 .../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 + .../org/chorem/pollen/services/bean/VoteBean.java | 10 + .../bean/resource/AbstractResourceBean.java | 59 ++++ .../services/bean/{ => resource}/GtuMetaBean.java | 2 +- .../bean/{ => resource}/ResourceFileBean.java | 69 ++-- .../bean/{ => resource}/ResourceMetaBean.java | 53 +-- .../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 +- 47 files changed, 772 insertions(+), 332 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.