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 8eec09e9042f11deb58d9cafee6121906636cd25 Merge: 540cdd3 af80ddf Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 24 14:38:16 2017 +0100 Merge branch 'feature/pollen-riot-js' into develop pollen-bundle/pom.xml | 4 +- pollen-bundle/src/main/assembly/bin.xml | 11 +- pollen-bundle/src/main/assembly/dist/conf.js | 22 +- .../main/assembly/dist/pollen-rest-api.properties | 20 + pollen-persistence/pom.xml | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 20954 -> 21327 bytes pollen-rest-api/pom.xml | 28 +- .../org/chorem/pollen/rest/api/JsonHelper.java | 19 +- .../rest/api/PollenRestApiApplicationListener.java | 4 + .../rest/api/PollenRestApiRequestFilter.java | 76 +- .../chorem/pollen/rest/api/PollenRestApiUtil.java | 72 - .../rest/api/converter/PollenEnumConverter.java | 54 + .../org/chorem/pollen/rest/api/v1/AuthApi.java | 100 +- .../org/chorem/pollen/rest/api/v1/ErrorAction.java | 13 - .../org/chorem/pollen/rest/api/v1/PollApi.java | 16 +- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 22 + .../chorem/pollen/rest/api/v1/VoterListApi.java | 4 +- pollen-rest-api/src/main/resources/mapping | 8 +- pollen-rest-api/src/main/webapp/WEB-INF/web.xml | 78 +- pollen-rest-api/src/site/markdown/auth.md | 53 + pollen-rest-api/src/site/markdown/index.md | 5 + pollen-rest-api/src/site/markdown/poll.md | 13 + .../src/site/site_en.xml | 46 +- .../org/chorem/pollen/rest/api/AuthApiTest.java | 10 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 27 +- .../chorem/pollen/rest/api/PollenUserApiTest.java | 62 +- .../chorem/pollen/rest/api/RestApiFixtures.java | 64 + pollen-services/pom.xml | 7 +- pollen-services/src/main/config/PollenServices.ini | 20 +- .../org/chorem/pollen/services/bean/PollBean.java | 118 +- .../chorem/pollen/services/bean/PollenBean.java | 14 +- .../pollen/services/bean/PollenUserBean.java | 12 + .../pollen/services/service/ChoiceService.java | 54 +- .../services/service/NotificationService.java | 15 + .../pollen/services/service/PollService.java | 88 +- .../pollen/services/service/PollenUserService.java | 46 +- .../pollen/services/service/VoteService.java | 8 + .../pollen/services/service/mail/EmailService.java | 14 + .../service/mail/ResendValidationEmail.java | 78 + .../security/DefaultPollenSecurityContext.java | 1 + .../security/MissingAuthenticationException.java | 26 +- .../security/PollenCypherTechnicalException.java | 33 +- .../service/security/PollenSecurityContext.java | 2 + .../services/service/security/SecurityService.java | 212 ++- .../resources/email/ResendValidationEmail.mustache | 8 + .../email/ResendValidationEmail_fr.mustache | 7 + pollen-services/src/main/resources/fixtures.yaml | 1 + .../i18n/pollen-services_en_GB.properties | 4 + .../i18n/pollen-services_fr_FR.properties | 4 + .../pollen/services/service/PollServiceTest.java | 4 +- .../service/PollenUIUrlRenderServiceTest.java | 14 +- .../services/service/VoteCountingServiceTest.java | 2 +- .../services/service/VoterListServiceTest.java | 4 +- pollen-ui-angular/.bowerrc | 5 - pollen-ui-angular/INSTALL.txt | 17 - pollen-ui-angular/LICENSE.txt | 661 ------- pollen-ui-angular/bower.json | 30 - pollen-ui-angular/package.json | 22 - pollen-ui-angular/pom.xml | 254 --- pollen-ui-angular/src/main/version.txt | 1 - pollen-ui-angular/src/main/webapp/i18n/en.js | 343 ---- pollen-ui-angular/src/main/webapp/i18n/fr.js | 342 ---- .../src/main/webapp/img/chart-icon.png | Bin 610 -> 0 bytes pollen-ui-angular/src/main/webapp/img/pie-icon.png | Bin 1292 -> 0 bytes pollen-ui-angular/src/main/webapp/index.html | 192 -- pollen-ui-angular/src/main/webapp/js/app.js | 146 -- .../src/main/webapp/js/conf.js.example | 48 - .../src/main/webapp/js/controllers/alertCtrl.js | 208 --- .../main/webapp/js/controllers/favoriteListCtrl.js | 241 --- .../src/main/webapp/js/controllers/localeCtrl.js | 70 - .../src/main/webapp/js/controllers/pollCtrl.js | 1953 -------------------- .../src/main/webapp/js/controllers/userCtrl.js | 292 --- pollen-ui-angular/src/main/webapp/js/directives.js | 727 -------- .../src/main/webapp/js/libs/ckeditor/config.js | 36 - .../main/webapp/js/scripts/sticky-inline-poll.js | 35 - pollen-ui-angular/src/main/webapp/js/services.js | 487 ----- pollen-ui-angular/src/main/webapp/less/style.less | 659 ------- .../src/main/webapp/less/variables.less | 122 -- .../src/main/webapp/partials/alerts.html | 37 - .../src/main/webapp/partials/big-poll.html | 79 - .../main/webapp/partials/favoriteList-edit.html | 82 - .../main/webapp/partials/favoriteList-list.html | 32 - .../src/main/webapp/partials/home.html | 36 - .../src/main/webapp/partials/inline-poll.html | 156 -- .../src/main/webapp/partials/pagination.html | 33 - .../src/main/webapp/partials/poll-comment.html | 96 - .../src/main/webapp/partials/poll-info.html | 70 - .../src/main/webapp/partials/poll-link.html | 90 - .../src/main/webapp/partials/poll-list.html | 46 - .../main/webapp/partials/poll-listParticipant.html | 117 -- .../src/main/webapp/partials/poll-poll.html | 45 - .../src/main/webapp/partials/poll-popupChoice.html | 76 - .../src/main/webapp/partials/poll-result.html | 89 - .../src/main/webapp/partials/poll-settings.html | 307 --- .../src/main/webapp/partials/poll.html | 117 -- .../src/main/webapp/partials/user-admin-list.html | 58 - .../webapp/partials/user-edit-editProfile.html | 65 - .../main/webapp/partials/user-edit-password.html | 64 - .../webapp/partials/user-edit-viewProfile.html | 46 - .../src/main/webapp/partials/user-edit.html | 29 - .../src/main/webapp/partials/user-login.html | 50 - .../main/webapp/partials/user-lostPassword.html | 43 - .../src/main/webapp/partials/user-register.html | 85 - pollen-ui-angular/src/test/karma.conf.js | 112 -- .../src/test/unit/alertControllersTest.js | 141 -- .../src/test/unit/pollControllersTest.js | 522 ------ pollen-ui-js/.gitignore | 2 - pollen-ui-js/README.txt | 58 - pollen-ui-js/changelog.txt | 40 - pollen-ui-js/pom.xml | 95 - .../src/main/resources/nuiton-js/wro.properties | 26 - pollen-ui-js/src/main/resources/nuiton-js/wro.xml | 42 - .../src/main/webapp/bundle/Messages.properties | 196 -- .../webapp/css/bootstrap-datetimepicker.min.css | 8 - pollen-ui-js/src/main/webapp/css/style.css | 104 -- .../src/main/webapp/img/glyphicons_050_link.png | Bin 1410 -> 0 bytes pollen-ui-js/src/main/webapp/img/pollen.png | Bin 28557 -> 0 bytes pollen-ui-js/src/main/webapp/index.html | 102 - pollen-ui-js/src/main/webapp/js/controls/menu.js | 59 - .../src/main/webapp/js/controls/poll_form.js | 176 -- .../src/main/webapp/js/controls/poll_list.js | 53 - .../src/main/webapp/js/controls/poll_summary.js | 55 - .../src/main/webapp/js/controls/user_form.js | 122 -- pollen-ui-js/src/main/webapp/js/controls/vote.js | 183 -- .../webapp/js/libs/bootstrap-datetimepicker.min.js | 26 - .../src/main/webapp/js/libs/jquery.scrollto.js | 54 - pollen-ui-js/src/main/webapp/js/models/comments.js | 70 - pollen-ui-js/src/main/webapp/js/models/polls.js | 104 -- pollen-ui-js/src/main/webapp/js/models/users.js | 102 - pollen-ui-js/src/main/webapp/js/models/votes.js | 168 -- pollen-ui-js/src/main/webapp/js/pollen-utils.js | 33 - pollen-ui-js/src/main/webapp/views/menu.ejs | 69 - pollen-ui-js/src/main/webapp/views/poll_form.ejs | 339 ---- pollen-ui-js/src/main/webapp/views/poll_list.ejs | 11 - pollen-ui-js/src/main/webapp/views/summary.ejs | 36 - pollen-ui-js/src/main/webapp/views/user_form.ejs | 75 - pollen-ui-js/src/main/webapp/views/vote.ejs | 192 -- pollen-ui-riot-js/.eslintrc | 265 +++ .../.gitignore | 2 +- {pollen-ui-js => pollen-ui-riot-js}/LICENSE.txt | 0 {pollen-ui-angular => pollen-ui-riot-js}/README.md | 6 - pollen-ui-riot-js/package.json | 43 + pollen-ui-riot-js/pom.xml | 148 ++ pollen-ui-riot-js/src/main/js/riotjs-loader.js | 61 + pollen-ui-riot-js/src/main/web/conf.json | 15 + pollen-ui-riot-js/src/main/web/css/main.css | 117 ++ pollen-ui-riot-js/src/main/web/i18n.json | 447 +++++ .../src/main/web}/img/en.png | Bin .../src/main/web}/img/fr.png | Bin .../src/main/web}/img/pollen.png | Bin .../src/main/web/index.html | 26 +- pollen-ui-riot-js/src/main/web/index.js | 27 + pollen-ui-riot-js/src/main/web/js/AuthService.js | 73 + .../src/main/web/js/Choice.js | 28 +- pollen-ui-riot-js/src/main/web/js/ChoiceService.js | 59 + .../src/main/web/js/CommentService.js | 55 + pollen-ui-riot-js/src/main/web/js/FetchService.js | 119 ++ pollen-ui-riot-js/src/main/web/js/FormHelper.js | 104 ++ pollen-ui-riot-js/src/main/web/js/I18nHelper.js | 73 + pollen-ui-riot-js/src/main/web/js/Pagination.js | 12 + pollen-ui-riot-js/src/main/web/js/PollForm.js | 209 +++ pollen-ui-riot-js/src/main/web/js/PollService.js | 79 + .../src/main/web/js/ResultService.js | 33 +- pollen-ui-riot-js/src/main/web/js/Session.js | 148 ++ .../src/main/web/js/Singleton.js | 34 +- pollen-ui-riot-js/src/main/web/js/UserService.js | 60 + .../src/main/web/js/VoteCountingTypeService.js | 36 +- pollen-ui-riot-js/src/main/web/js/VoteService.js | 55 + pollen-ui-riot-js/src/main/web/robots.txt | 2 + pollen-ui-riot-js/src/main/web/tag/Footer.tag | 61 + pollen-ui-riot-js/src/main/web/tag/Header.tag | 198 ++ pollen-ui-riot-js/src/main/web/tag/HeaderI18n.tag | 124 ++ pollen-ui-riot-js/src/main/web/tag/Home.tag | 91 + pollen-ui-riot-js/src/main/web/tag/Pagination.tag | 165 ++ pollen-ui-riot-js/src/main/web/tag/Pollen.tag | 164 ++ pollen-ui-riot-js/src/main/web/tag/SignCheck.tag | 110 ++ pollen-ui-riot-js/src/main/web/tag/SignIn.tag | 118 ++ pollen-ui-riot-js/src/main/web/tag/SignUp.tag | 127 ++ pollen-ui-riot-js/src/main/web/tag/Users.tag | 310 ++++ .../src/main/web/tag/poll/ChoiceDate.tag | 249 +++ .../src/main/web/tag/poll/ChoiceText.tag | 176 ++ .../src/main/web/tag/poll/Choices.tag | 302 +++ .../src/main/web/tag/poll/CommentPopup.tag | 192 ++ .../src/main/web/tag/poll/Comments.tag | 245 +++ .../src/main/web/tag/poll/CreatePoll.tag | 195 ++ .../src/main/web/tag/poll/Created.tag | 64 + .../src/main/web/tag/poll/Description.tag | 80 + pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag | 244 +++ pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag | 213 +++ .../src/main/web/tag/poll/Results.tag | 108 ++ .../src/main/web/tag/poll/Settings.tag | 766 ++++++++ pollen-ui-riot-js/src/main/web/tag/poll/Voters.tag | 205 ++ pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag | 469 +++++ .../src/main/web/tag/popup/AccountCreated.tag | 142 ++ .../src/main/web/tag/popup/NewPassword.tag | 185 ++ .../src/main/web/tag/popup/ResendValidation.tag | 187 ++ .../src/main/webapp/WEB-INF/web.xml | 4 +- pollen-ui-riot-js/webpack.config.js | 71 + 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 | 52 +- 208 files changed, 9142 insertions(+), 12672 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.