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 f510580d035a13abca77a5d12713e67406708f66 Merge: f966c64 7f5b0e5 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 30 13:33:09 2017 +0200 Merge remote-tracking branch 'origin/develop' into develop .../org/chorem/pollen/services/bean/PollBean.java | 3 +- .../services/job/SendPollEndReminderJob.java | 7 +- pollen-ui-riot-js/src/main/web/i18n.json | 22 +++--- pollen-ui-riot-js/src/main/web/js/Error.js | 3 +- pollen-ui-riot-js/src/main/web/js/UIHelper.js | 2 +- .../main/web/tag/components/date-picker.tag.html | 37 +++++++--- .../web/tag/components/date-time-picker.tag.html | 78 ++++++++++++++++++++++ .../main/web/tag/components/time-picker.tag.html | 67 ++++++++++++------- .../src/main/web/tag/poll/EditPoll.tag.html | 14 ++-- .../src/main/web/tag/poll/Settings.tag.html | 67 +++++++++---------- 10 files changed, 210 insertions(+), 90 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.