This is an automated email from the git hooks/post-receive script. New change to branch master in repository pollen. See http://git.chorem.org/pollen.git from e5a1179 Merge branch 'release/2.0-alpha-1' adds 2ed75b2 fixes #1060 Comment page layout adds 1f0dd60 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 761e793 Merge branch 'master' into develop adds 3fab593 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 3ece749 Merge remote-tracking branch 'origin/develop' into develop adds 216c9e7 add release files to redmine adds da6637e add error when vote not started adds 3b56ff7 fixes #1069 add favicon adds c936c1b fixes #1076 change bottom links adds 68dbf56 fixes #1089 icon on error alert adds 6868130 fixes #1087 remove ng-click on tabs (conflit between ng-click and $locationChangeSuccess) adds 2379138 fixes #1085 add an action of sidebar to comment poll fixes #1086 add tooltips for minify and maxify sidebar adds cf021ef minify sidebar by default adds aa8e297 change cursor for input have selectOnClick and improve transition for comments page adds ec745a5 refs #1075 add notification when email not validate adds a2aa2e5 add translate poll.noComment, fix link comment in sidebar adds bd05eab fix name of defaultAlertTimeWarning adds 4161687 for cursor pointer on input readonly adds c5a2a28 add trigger to hide alert adds b716058 remove alert when can remove it adds bb5a0b3 fixes #1068 redirect to home when logout and delete all alert, and delete all data in session storage without locale adds 4e502e2 remove debug code adds 77569dc fixes #1088 remove invalid date message adds af95052 Fix choices tables border style adds 4fa505d separate differente form in user profile page adds 6f8d6e6 add view Profile adds beb223b fixes #1065 adds 850b979 change icon delete adds 354d32b Merge branch 'develop' of https://git.chorem.org/pollen into develop adds f023936 Fix typos, case and some anglicisms in the french i18nbundle adds fb29704 Merge remote-tracking branch 'origin/feature/capello-master-on-fire' into develop adds f9965bc no fixed height for print vote, and action for vote on one line adds 2e5a2c7 [jgitflow-maven-plugin]updating poms for branch '2.0-alpha-2' with snapshot versions adds 113d23d [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-2' with non-snapshot versions adds 733e247 fix license headers adds 613b614 Merge branch 'release/2.0-alpha-2' No new revisions were added by this update. Summary of changes: pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 6 +- pollen-services/pom.xml | 2 +- .../pollen/services/bean/PollenUserBean.java | 11 +++ pollen-ui-angular/bower.json | 4 +- pollen-ui-angular/pom.xml | 7 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 20 ++++- pollen-ui-angular/src/main/webapp/i18n/fr.js | 94 ++++++++++--------- pollen-ui-angular/src/main/webapp/img/pollen.png | Bin 28557 -> 610 bytes pollen-ui-angular/src/main/webapp/index.html | 14 +-- .../src/main/webapp/js/conf.js.example | 2 +- .../src/main/webapp/js/controllers/alertCtrl.js | 100 ++++++++++++++++----- .../src/main/webapp/js/controllers/pollCtrl.js | 53 +++++++++-- .../src/main/webapp/js/controllers/userCtrl.js | 57 +++++++++--- pollen-ui-angular/src/main/webapp/js/directives.js | 8 +- pollen-ui-angular/src/main/webapp/less/style.less | 94 +++++++++++-------- .../main/webapp/partials/favoriteList-edit.html | 4 +- .../src/main/webapp/partials/inline-poll.html | 10 +-- .../src/main/webapp/partials/poll-comment.html | 83 ++++++++++------- .../src/main/webapp/partials/poll-info.html | 4 +- .../src/main/webapp/partials/poll-link.html | 14 ++- .../src/main/webapp/partials/poll-list.html | 2 +- .../main/webapp/partials/poll-listParticipant.html | 4 +- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- .../src/main/webapp/partials/poll.html | 20 ++--- .../src/main/webapp/partials/user-admin-list.html | 2 +- .../{user-edit.html => user-edit-editProfile.html} | 47 +--------- .../{user-edit.html => user-edit-password.html} | 42 --------- ...intResource.html => user-edit-viewProfile.html} | 30 ++++--- .../src/main/webapp/partials/user-edit.html | 94 ++----------------- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 40 files changed, 461 insertions(+), 391 deletions(-) copy pollen-ui-angular/src/main/webapp/partials/{user-edit.html => user-edit-editProfile.html} (56%) copy pollen-ui-angular/src/main/webapp/partials/{user-edit.html => user-edit-password.html} (67%) copy pollen-ui-angular/src/main/webapp/partials/{printResource.html => user-edit-viewProfile.html} (54%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.