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