- Pollen-commits - mailman.cloud.codelutin.com

branch feature/151_desinscription created (now 17348adb)
by chorem.org scm 03 Oct '17

03 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/151_desinscription in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 17348adb fixes #151 I cannot delete my account This branch includes the following new commits: new 17348adb fixes #151 I cannot delete my account 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 17348adb627161ed79d7613d5da7cce332e65d87 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 3 10:57:21 2017 +0200 fixes #151 I cannot delete my account -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/148-configuration-methodes-de-votes updated (a59ea622 -> 4e17e544)
by chorem.org scm 03 Oct '17

03 Oct '17

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(a)chorem.org>.

1 0

annotated tag pollen-3.0.0-beta-1 created (now 0e2f4c2c)
by chorem.org scm 03 Oct '17

03 Oct '17

This is an automated email from the git hooks/post-receive script. New change to annotated tag pollen-3.0.0-beta-1 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 0e2f4c2c (tag) tagging f98f087e7b5484afa8032536b4195af46bd24db5 (commit) replaces pollen-3.0-beta-1 tagged by Sylvain Bavencoff on Thu Mar 30 17:39:45 2017 +0200 - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

annotated tag pollen-3.0-beta-1 created (now 81cc38bd)
by chorem.org scm 03 Oct '17

03 Oct '17

This is an automated email from the git hooks/post-receive script. New change to annotated tag pollen-3.0-beta-1 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 81cc38bd (tag) tagging d143ba0b8025eb750152ebb4a7e26ed1e770b54a (commit) replaces pollen-2.0-alpha-3 tagged by Sylvain Bavencoff on Thu Mar 30 15:52:26 2017 +0200 - Log ----------------------------------------------------------------- Refactor UI ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

annotated tag 3.0.1 created (now 61fc11f8)
by chorem.org scm 03 Oct '17

03 Oct '17

This is an automated email from the git hooks/post-receive script. New change to annotated tag 3.0.1 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 61fc11f8 (tag) tagging 41342262932c11370a0ded0e0f613d2ff660f85d (commit) replaces 3.0.0 tagged by Sylvain Bavencoff on Tue Oct 3 09:47:45 2017 +0200 - Log ----------------------------------------------------------------- tag de la version 3.0.1 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch master updated (bdf3b65c -> 5989d7d9)
by chorem.org scm 03 Oct '17

03 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch master in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from bdf3b65c Merge branch 'release/3.0.0' 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 new 5989d7d9 Merge branch 'hotfix/3.0.1' 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 5989d7d95669950fbcecaafa29c52597bfb5cdc8 Merge: bdf3b65c 41342262 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 3 09:46:32 2017 +0200 Merge branch 'hotfix/3.0.1' Summary of changes: CHANGELOG | 6 ++ pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- .../pollen/services/service/VoteService.java | 93 ++++++++++++++++------ .../services/service/security/SecurityService.java | 32 ++++++-- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 6 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 6 +- pollen-ui-riot-js/src/main/web/js/Poll.js | 44 +++++----- pollen-ui-riot-js/src/main/web/js/Session.js | 2 + pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 13 ++- .../src/main/web/tag/poll/Choice.tag.html | 2 +- .../src/main/web/tag/poll/Votes.tag.html | 2 +- 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 +- 25 files changed, 158 insertions(+), 78 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (3f4c675f -> 4e17e544)
by chorem.org scm 03 Oct '17

03 Oct '17

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 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 new 4e17e544 Merge tag '3.0.1' into develop 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 4e17e544c1937b01a815ee3e1114a8cb76610e09 Merge: 3f4c675f 41342262 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 3 09:57:54 2017 +0200 Merge tag '3.0.1' into develop tag de la version 3.0.1 # Conflicts: # pollen-persistence/pom.xml # pollen-rest-api/pom.xml # pollen-services/pom.xml # pollen-ui-riot-js/package.json # pollen-ui-riot-js/pom.xml # pollen-ui-riot-js/src/main/web/i18n/en.json # pollen-ui-riot-js/src/main/web/i18n/fr.json # pollen-votecounting-aggregator/pom.xml # pollen-votecounting-api/pom.xml # pollen-votecounting-borda/pom.xml # pollen-votecounting-condorcet/pom.xml # pollen-votecounting-coombs/pom.xml # pollen-votecounting-instant-runoff/pom.xml # pollen-votecounting-normal/pom.xml # pollen-votecounting-number/pom.xml # pollen-votecounting-percentage/pom.xml # pom.xml Summary of changes: CHANGELOG | 6 ++ .../pollen/services/service/VoteService.java | 93 ++++++++++++++++------ .../services/service/security/SecurityService.java | 32 ++++++-- pollen-ui-riot-js/src/main/web/i18n/en.json | 2 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 4 +- pollen-ui-riot-js/src/main/web/js/Poll.js | 44 +++++----- pollen-ui-riot-js/src/main/web/js/Session.js | 2 + pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 13 ++- .../src/main/web/tag/poll/Choice.tag.html | 2 +- 9 files changed, 139 insertions(+), 59 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch hotfix/3.0.1 updated (b1ba1d22 -> 41342262)
by chorem.org scm 03 Oct '17

03 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch hotfix/3.0.1 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from b1ba1d22 correction vote pour un sondage restreint par le créateur connecté avec le token d'un autre invité new 41342262 update changlog 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 41342262932c11370a0ded0e0f613d2ff660f85d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 3 09:41:03 2017 +0200 update changlog Summary of changes: CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch hotfix/3.0.1 updated (ca08eafd -> b1ba1d22)
by chorem.org scm 03 Oct '17

03 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch hotfix/3.0.1 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from ca08eafd réaffichage de la page après la connexion new b1ba1d22 correction vote pour un sondage restreint par le créateur connecté avec le token d'un autre invité 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 b1ba1d22f597e297b0137664cbda9342379d6a46 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 3 09:33:56 2017 +0200 correction vote pour un sondage restreint par le créateur connecté avec le token d'un autre invité Summary of changes: .../pollen/services/service/VoteService.java | 93 ++++++++++++++++------ .../services/service/security/SecurityService.java | 32 ++++++-- pollen-ui-riot-js/src/main/web/js/Poll.js | 44 +++++----- 3 files changed, 116 insertions(+), 53 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch hotfix/3.0.1 updated (567aa0d1 -> ca08eafd)
by chorem.org scm 02 Oct '17

02 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch hotfix/3.0.1 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 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 new ca08eafd réaffichage de la page après la connexion 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 ca08eafda90b3a636d34e5e5065120908febeb76 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 2 16:23:50 2017 +0200 réaffichage de la page après la connexion Summary of changes: pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1