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 2e8ad60 debut du composant d'édition de choix adds adcf381 style de l'entête du pied et de l'ecran d'acceuille adds 12e321d Adaptation de l'écran de création de sondage adds 8031085 Merge branch 'feature/small-screen' into 'develop' new c302749 debut du composant d'édition de choix new 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 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 (2e8ad60) \ N -- N -- N refs/heads/feature/component_choice_editor (42a357e) 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 2 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 42a357e4169e3aed74c4ec06038e94762d098d60 Author: Kevin Morin <morin@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 c302749af39b6f1bcdf00edad40ca671e720a559 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 2 18:29:54 2017 +0100 debut du composant d'édition de choix Summary of changes: pollen-persistence/src/main/xmi/pollen.zargo | Bin 21327 -> 21426 bytes pollen-ui-riot-js/package.json | 1 + pollen-ui-riot-js/src/main/web/css/main.css | 62 +- pollen-ui-riot-js/src/main/web/i18n.json | 68 +- pollen-ui-riot-js/src/main/web/index.html | 2 + pollen-ui-riot-js/src/main/web/js/I18nHelper.js | 4 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 108 +-- pollen-ui-riot-js/src/main/web/js/Session.js | 15 + pollen-ui-riot-js/src/main/web/tag/Footer.tag.html | 7 +- pollen-ui-riot-js/src/main/web/tag/Header.tag.html | 112 +-- .../src/main/web/tag/HeaderI18n.tag.html | 6 +- pollen-ui-riot-js/src/main/web/tag/Home.tag.html | 50 +- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 2 +- .../main/web/tag/components/date-picker.tag.html | 230 +++++ .../main/web/tag/components/time-picker.tag.html | 240 ++++++ .../src/main/web/tag/poll/Choice.tag.html | 194 +++++ .../src/main/web/tag/poll/ChoiceImage.tag.html | 77 -- .../src/main/web/tag/poll/ChoiceText.tag.html | 176 ---- .../src/main/web/tag/poll/Choices.tag.html | 331 +------ .../src/main/web/tag/poll/CreatePoll.tag.html | 216 ++--- .../src/main/web/tag/poll/Description.tag.html | 91 +- .../src/main/web/tag/poll/Settings.tag.html | 950 ++++++--------------- .../src/main/web/tag/poll/Voters.tag.html | 217 ++--- pollen-ui-riot-js/webpack.config.js | 3 +- 24 files changed, 1378 insertions(+), 1784 deletions(-) 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/ChoiceImage.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>.