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

branch develop updated (14536b4 -> e2c8fa0)
by chorem.org scm 13 Mar '17

13 Mar '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 14536b4 Merge branch 'feature/votes-screen' into 'develop' adds 23a5ddb debut du composant d'édition de choix adds d94a8fa - ajout du type datetime dans le modele pour les choix - utilisation du composant de choix dans le formulaire - utilisation des input de type date et time quand supportés adds 177e153 modification du parsing des dates : maintenant on attend le timestamp pour les types date et datetime adds 38c722b - enrgistrement des choix de type date, datetime et resource - affichage des choix de types resources adds 8f6b10d gestion de l'édition des choix de type resource adds 1fd5df6 ajout de la description adds 1bad9bf gestion des images adds d425029 enlarge time editor adds 0890755 remove dead code + replace syntax new e2c8fa0 Merge branch 'feature/component_choice_editor' 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 e2c8fa047556d50620d7264b36687a6553099326 Merge: 14536b4 0890755 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Mar 13 12:25:28 2017 +0100 Merge branch 'feature/component_choice_editor' into 'develop' Composant d'édition des choix See merge request !6 Summary of changes: pollen-persistence/src/main/xmi/pollen.zargo | Bin 21327 -> 21426 bytes .../chorem/pollen/services/bean/ChoiceBean.java | 54 +----- .../pollen/services/service/ChoiceService.java | 49 ++--- pollen-ui-riot-js/package.json | 1 + pollen-ui-riot-js/src/main/web/css/main.css | 5 +- pollen-ui-riot-js/src/main/web/i18n.json | 6 +- pollen-ui-riot-js/src/main/web/index.js | 1 + pollen-ui-riot-js/src/main/web/js/FetchService.js | 4 +- pollen-ui-riot-js/src/main/web/js/I18nHelper.js | 4 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 142 ++++++-------- ...teCountingTypeService.js => ResourceService.js} | 20 +- pollen-ui-riot-js/src/main/web/js/Session.js | 15 ++ pollen-ui-riot-js/src/main/web/js/UIHelper.js | 38 ++++ pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 2 - .../main/web/tag/components/date-picker.tag.html | 194 +++++++++++++++++++ .../main/web/tag/components/time-picker.tag.html | 207 +++++++++++++++++++++ .../src/main/web/tag/poll/Choice.tag.html | 207 +++++++++++++++++++++ .../src/main/web/tag/poll/ChoiceText.tag.html | 176 ------------------ .../src/main/web/tag/poll/Choices.tag.html | 15 +- .../src/main/web/tag/poll/CreatePoll.tag.html | 2 +- .../src/main/web/tag/poll/Votes.tag.html | 35 +++- 21 files changed, 793 insertions(+), 384 deletions(-) copy pollen-ui-riot-js/src/main/web/js/{VoteCountingTypeService.js => ResourceService.js} (63%) create mode 100644 pollen-ui-riot-js/src/main/web/js/UIHelper.js create mode 100644 pollen-ui-riot-js/src/main/web/tag/components/date-picker.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/components/time-picker.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html delete mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/ChoiceText.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/component_choice_editor updated (d425029 -> 0890755)
by chorem.org scm 13 Mar '17

13 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/component_choice_editor in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from d425029 enlarge time editor adds 0890755 remove dead code + replace syntax No new revisions were added by this update. Summary of changes: pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html | 11 ----------- pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/component_choice_editor updated (1bad9bf -> d425029)
by chorem.org scm 10 Mar '17

10 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/component_choice_editor in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 1bad9bf gestion des images adds d425029 enlarge time editor No new revisions were added by this update. Summary of changes: pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/component_choice_editor updated (f04ec38 -> 1bad9bf)
by chorem.org scm 10 Mar '17

10 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/component_choice_editor in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git omits f04ec38 ajout de la description omits 331303d gestion de l'édition des choix de type resource omits 97d6722 - enrgistrement des choix de type date, datetime et resource - affichage des choix de types resources omits 8463c37 modification du parsing des dates : maintenant on attend le timestamp pour les types date et datetime omits 42a357e - ajout du type datetime dans le modele pour les choix - utilisation du composant de choix dans le formulaire - utilisation des input de type date et time quand supportés omits c302749 debut du composant d'édition de choix adds 729b8a0 enregistrement du la connexion dans le cooki du navigateur adds 8fcff27 Merge branch 'feature/save-login-in-cookie' into 'develop' adds 77b9935 correction dépendance de la session adds a6a1d68 back: remove ui urls from conf adds 9fcf2f6 ajout des urls dans l'uicontext adds 46a5188 ajout d'une fxiture de pollenuicontext adds a3b0092 Merge branch 'feature/delete_ui_url_in_back_conf' into 'develop' adds 36e2bfc Adaptation de l'écran de votes adds 8064e2b fix js conf adds 14536b4 Merge branch 'feature/votes-screen' into 'develop' new 23a5ddb debut du composant d'édition de choix new d94a8fa - ajout du type datetime dans le modele pour les choix - utilisation du composant de choix dans le formulaire - utilisation des input de type date et time quand supportés new 177e153 modification du parsing des dates : maintenant on attend le timestamp pour les types date et datetime new 38c722b - enrgistrement des choix de type date, datetime et resource - affichage des choix de types resources new 8f6b10d gestion de l'édition des choix de type resource new 1fd5df6 ajout de la description new 1bad9bf gestion des images 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 (f04ec38) \ N -- N -- N refs/heads/feature/component_choice_editor (1bad9bf) 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 7 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 1bad9bfdea6777c68dae5d0cf49e3fee041aaadd Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 10 17:17:06 2017 +0100 gestion des images commit 1fd5df63ccbbd27f383a8c30aa80e240871457a7 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 10 16:43:30 2017 +0100 ajout de la description commit 8f6b10d98ca302bba6a8a4b86ff9db57cb1dbd56 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 9 17:11:41 2017 +0100 gestion de l'édition des choix de type resource commit 38c722b57699ee42e4fed86a84339e6b2e4fb7ab Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 9 16:42:57 2017 +0100 - enrgistrement des choix de type date, datetime et resource - affichage des choix de types resources commit 177e15358643effc741e0103222ec61b9d01bb1c Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 9 16:38:00 2017 +0100 modification du parsing des dates : maintenant on attend le timestamp pour les types date et datetime commit d94a8fac7409b17638c0ef37ac1aa2f1d5bce0b2 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 7 18:13:40 2017 +0100 - ajout du type datetime dans le modele pour les choix - utilisation du composant de choix dans le formulaire - utilisation des input de type date et time quand supportés commit 23a5ddbf31b35500d808ce205545f4a8114f2263 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 2 18:29:54 2017 +0100 debut du composant d'édition de choix Summary of changes: .../org/chorem/pollen/rest/api/v1/PollApi.java | 10 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 3 + pollen-services/src/main/config/PollenServices.ini | 30 - .../org/chorem/pollen/services/PollenFixtures.java | 1 + .../chorem/pollen/services/PollenUIContext.java | 31 + .../pollen/services/service/FixturesService.java | 2 +- .../services/service/NotificationService.java | 8 +- .../pollen/services/service/PollService.java | 9 +- .../services/service/PollenUIUrlRenderService.java | 74 ++- .../pollen/services/service/mail/EmailService.java | 78 +-- pollen-services/src/main/resources/fixtures.yaml | 8 + .../pollen/services/service/PollServiceTest.java | 13 +- .../service/PollenUIUrlRenderServiceTest.java | 48 +- .../services/service/VoteCountingServiceTest.java | 3 +- .../services/service/VoterListServiceTest.java | 5 +- pollen-ui-riot-js/src/main/web/i18n.json | 25 +- pollen-ui-riot-js/src/main/web/js/AuthService.js | 15 +- pollen-ui-riot-js/src/main/web/js/FetchService.js | 10 +- pollen-ui-riot-js/src/main/web/js/Poll.js | 189 ++++++ pollen-ui-riot-js/src/main/web/js/Session.js | 52 +- pollen-ui-riot-js/src/main/web/tag/Header.tag.html | 4 +- pollen-ui-riot-js/src/main/web/tag/Home.tag.html | 9 +- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 7 +- .../src/main/web/tag/poll/Choice.tag.html | 2 - .../src/main/web/tag/poll/Comments.tag.html | 403 ++++++------ .../src/main/web/tag/poll/CreatePoll.tag.html | 2 +- .../src/main/web/tag/poll/Poll.tag.html | 253 ++------ .../src/main/web/tag/poll/Results.tag.html | 113 ++-- .../src/main/web/tag/poll/Votes.tag.html | 708 +++++++++------------ 29 files changed, 1035 insertions(+), 1080 deletions(-) create mode 100644 pollen-ui-riot-js/src/main/web/js/Poll.js -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 7

branch feature/options-de-vote created (now 14536b4)
by chorem.org scm 10 Mar '17

10 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/options-de-vote in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 14536b4 Merge branch 'feature/votes-screen' into 'develop' 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 feature/component_choice_editor updated (97d6722 -> f04ec38)
by chorem.org scm 10 Mar '17

10 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/component_choice_editor in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 97d6722 - enrgistrement des choix de type date, datetime et resource - affichage des choix de types resources adds 331303d gestion de l'édition des choix de type resource adds f04ec38 ajout de la description No new revisions were added by this update. Summary of changes: pollen-ui-riot-js/src/main/web/i18n.json | 2 + pollen-ui-riot-js/src/main/web/index.js | 1 + pollen-ui-riot-js/src/main/web/js/FetchService.js | 3 - pollen-ui-riot-js/src/main/web/js/UIHelper.js | 38 ++++++++ pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 2 - .../main/web/tag/components/date-picker.tag.html | 102 +++++++-------------- .../main/web/tag/components/time-picker.tag.html | 50 ++-------- .../src/main/web/tag/poll/Choice.tag.html | 43 +++++++-- .../src/main/web/tag/poll/CreatePoll.tag.html | 20 ++-- 9 files changed, 127 insertions(+), 134 deletions(-) create mode 100644 pollen-ui-riot-js/src/main/web/js/UIHelper.js -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/votes-screen deleted (was 8064e2b)
by chorem.org scm 10 Mar '17

10 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/votes-screen in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git was 8064e2b fix js conf The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch develop updated (a3b0092 -> 14536b4)
by chorem.org scm 10 Mar '17

10 Mar '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 a3b0092 Merge branch 'feature/delete_ui_url_in_back_conf' into 'develop' adds 36e2bfc Adaptation de l'écran de votes adds 8064e2b fix js conf new 14536b4 Merge branch 'feature/votes-screen' 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 14536b45a124164ca415835f0a84a220522aac83 Merge: a3b0092 8064e2b Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 10 16:40:52 2017 +0100 Merge branch 'feature/votes-screen' into 'develop' écran de vote See merge request !5 Summary of changes: pollen-ui-riot-js/src/main/web/i18n.json | 25 +- pollen-ui-riot-js/src/main/web/js/FetchService.js | 3 + pollen-ui-riot-js/src/main/web/js/Poll.js | 189 ++++++ pollen-ui-riot-js/src/main/web/js/Session.js | 15 +- pollen-ui-riot-js/src/main/web/tag/Home.tag.html | 9 +- .../src/main/web/tag/poll/Comments.tag.html | 403 ++++++------ .../src/main/web/tag/poll/CreatePoll.tag.html | 22 +- .../src/main/web/tag/poll/Poll.tag.html | 253 ++------ .../src/main/web/tag/poll/Results.tag.html | 113 ++-- .../src/main/web/tag/poll/Votes.tag.html | 701 +++++++++------------ 10 files changed, 820 insertions(+), 913 deletions(-) create mode 100644 pollen-ui-riot-js/src/main/web/js/Poll.js -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/votes-screen updated (36e2bfc -> 8064e2b)
by chorem.org scm 10 Mar '17

10 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/votes-screen in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 36e2bfc Adaptation de l'écran de votes adds 8064e2b fix js conf No new revisions were added by this update. Summary of changes: pollen-ui-riot-js/src/main/web/conf.js | 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 0

branch feature/votes-screen updated (77b9935 -> 36e2bfc)
by chorem.org scm 10 Mar '17

10 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/votes-screen in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 77b9935 correction dépendance de la session adds 36e2bfc Adaptation de l'écran de votes No new revisions were added by this update. Summary of changes: pollen-ui-riot-js/src/main/web/conf.js | 2 +- pollen-ui-riot-js/src/main/web/i18n.json | 25 +- pollen-ui-riot-js/src/main/web/js/FetchService.js | 3 + pollen-ui-riot-js/src/main/web/js/Poll.js | 189 ++++++ pollen-ui-riot-js/src/main/web/js/Session.js | 15 +- pollen-ui-riot-js/src/main/web/tag/Home.tag.html | 9 +- .../src/main/web/tag/poll/Comments.tag.html | 403 ++++++------ .../src/main/web/tag/poll/CreatePoll.tag.html | 22 +- .../src/main/web/tag/poll/Poll.tag.html | 253 ++------ .../src/main/web/tag/poll/Results.tag.html | 113 ++-- .../src/main/web/tag/poll/Votes.tag.html | 701 +++++++++------------ 11 files changed, 821 insertions(+), 914 deletions(-) create mode 100644 pollen-ui-riot-js/src/main/web/js/Poll.js -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0