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 3f4c675f fixes #28 Avatar for the users adds c9e1e9ab Passage en version 3.0.1 adds ff9fe24e Correction des traductions adds 45e53c95 correction du pattern vide du choix adds bf5ac4c4 fixes #156 I cannot edit my vote in a restricted poll adds 567aa0d1 fixes #154 The icons to log in through 3rd party providers do not display if I want to log in after my token expires adds ca08eafd réaffichage de la page après la connexion adds b1ba1d22 correction vote pour un sondage restreint par le créateur connecté avec le token d'un autre invité adds 41342262 update changlog new 4e17e544 Merge tag '3.0.1' 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 4e17e544c1937b01a815ee3e1114a8cb76610e09 Merge: 3f4c675f 41342262 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 3 09:57:54 2017 +0200 Merge tag '3.0.1' into develop tag de la version 3.0.1 # Conflicts: # pollen-persistence/pom.xml # pollen-rest-api/pom.xml # pollen-services/pom.xml # pollen-ui-riot-js/package.json # pollen-ui-riot-js/pom.xml # pollen-ui-riot-js/src/main/web/i18n/en.json # pollen-ui-riot-js/src/main/web/i18n/fr.json # pollen-votecounting-aggregator/pom.xml # pollen-votecounting-api/pom.xml # pollen-votecounting-borda/pom.xml # pollen-votecounting-condorcet/pom.xml # pollen-votecounting-coombs/pom.xml # pollen-votecounting-instant-runoff/pom.xml # pollen-votecounting-normal/pom.xml # pollen-votecounting-number/pom.xml # pollen-votecounting-percentage/pom.xml # pom.xml Summary of changes: CHANGELOG | 6 ++ .../pollen/services/service/VoteService.java | 93 ++++++++++++++++------ .../services/service/security/SecurityService.java | 32 ++++++-- pollen-ui-riot-js/src/main/web/i18n/en.json | 2 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 4 +- pollen-ui-riot-js/src/main/web/js/Poll.js | 44 +++++----- pollen-ui-riot-js/src/main/web/js/Session.js | 2 + pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 13 ++- .../src/main/web/tag/poll/Choice.tag.html | 2 +- 9 files changed, 139 insertions(+), 59 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.