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 14536b45a124164ca415835f0a84a220522aac83 Merge: a3b0092 8064e2b Author: Kevin Morin <morin@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 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(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.