branch develop updated (540cdd3 -> 8eec09e)
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 540cdd3 optimize dependencies + fix i18n issues in services module adds 180ede0 clean code and improve CORS management adds 3105d06 initial import of pollen-ui-riot-js adds 57673fc debut formulaire de création de sondage (le squelette) + améliorations sur les écrans de connexion adds 8ee9e61 ajout des choix de type text + quelques améliorations ailleurs adds 99f2665 Use same configuration as default bundle application for dev adds b0e0ac1 Amélioration i18n + utilisation base par défaut sinon certaines pages ne sont pas accessibles en direct adds c9359ff Review security and use now cookies to store authentication informations adds b858f7c Amélioration tests adds 5337f63 Add resendValidation backend + use now cookies to manage auth cache adds e518f4b Can authentice via the cookie adds ea74725 Use a package for poll tags + continue ui adds d653e81 Suppression EmitterService (tout est dans la session), enfin on peut créer un sondage adds 086d54f Add help mecanism on settings adds 1187a24 Add missing license header + remove my organisation adds e34256d fix node build adds d960be5 Début de documentation de l'api REST adds 29ccbc0 Mise en place des commentaires sur sondage + continue page de vote adds 050bfbc improve PollenBean adds c802d85 Ajout des votes adds e92f3d3 ajout de nombre de votes sur un sondage adds 9ca5676 Ajout des résultats + ... adds ffecc85 Utilisation de moment pour afficher les dates + continue le dev sur les sondages adds c010c40 correction de la récupération de l'utilisateur adds e2bba0f Pouvoir réouvrir le sondage adds 84e3939 i18n pagination + améliorations adds c67bcb2 gestion des choix en mode edition adds 55df734 Amélioration settings adds a86254a fix tests adds 03ce02e Mise en place des différents types de scrutin + revue des éditeurs de votes adds 978e3cf Meilleure organisation de la configuration + édition adds 9e2028e i18n sur la page de création du sondage adds 5905e4b Mise en place des choix de type date adds 3a579a0 amélioration rendu choix de date adds ef56fe0 ajout menu de création de sondage + amélioration rendu des choix dans les résultats adds 3962250 gestion i18n des checkbox :) adds 702d0f2 quelques retouches de styles adds 371c5fc Ajout de la gestion des utilisateurs adds b89351e gestion des utilisateurs bannis adds 69819a2 Renommage de tags + gestion des participants à un sondage adds 2dd6e4e mise en place du linter pour le js et les tag riot et correction de ces fichiers adds 4192d9d fix popup background style: in firefox, it started from the middle of the screen adds 063c7d9 Even in dev mode, the emails are sent. By default, the SMTP is configured to be a local devmail instance adds 6e9a9d6 style i18n header adds 8b7730b refs #2 Create a basic poll : the creator info did not have the right names adds 3468fab change parent pom + upgrade version to 3.0 adds ebe2603 revert changes to fix tests adds b91ed54 upgrade all poms to 3.0 + remove old js folders adds 1b13441 Generate poll participants for restricted poll adds af80ddf Add my participant polls and my invited polls new 8eec09e Merge branch 'feature/pollen-riot-js' 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 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 Summary of changes: 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 | 29 +- .../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 + ...reatedEmail.java => ResendValidationEmail.java} | 16 +- .../security/DefaultPollenSecurityContext.java | 1 + ...on.java => MissingAuthenticationException.java} | 2 +- ...on.java => PollenCypherTechnicalException.java} | 12 +- .../service/security/PollenSecurityContext.java | 2 + .../services/service/security/SecurityService.java | 212 ++- ...ail.mustache => ResendValidationEmail.mustache} | 4 +- ....mustache => ResendValidationEmail_fr.mustache} | 3 - 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/mainCtrl.js | 35 - .../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/printResource.html | 40 - .../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.ci.js | 38 - 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/choices.js | 27 - 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/js/route.js | 36 - 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 | 30 +- 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 | 35 +- pollen-ui-riot-js/src/main/web/js/Session.js | 148 ++ .../src/main/web/js/Singleton.js | 28 +- pollen-ui-riot-js/src/main/web/js/UserService.js | 60 + .../src/main/web/js/VoteCountingTypeService.js | 33 +- 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 +- 213 files changed, 9028 insertions(+), 12825 deletions(-) delete mode 100644 pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java create mode 100644 pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/PollenEnumConverter.java create mode 100644 pollen-rest-api/src/site/markdown/auth.md create mode 100644 pollen-rest-api/src/site/markdown/index.md create mode 100644 pollen-rest-api/src/site/markdown/poll.md copy pollen-ui-angular/src/main/webapp/WEB-INF/web.xml => pollen-rest-api/src/site/site_en.xml (59%) create mode 100644 pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/RestApiFixtures.java copy pollen-services/src/main/java/org/chorem/pollen/services/service/mail/{UserAccountCreatedEmail.java => ResendValidationEmail.java} (77%) copy pollen-services/src/main/java/org/chorem/pollen/services/service/security/{PollenInvalidPasswordException.java => MissingAuthenticationException.java} (93%) copy pollen-services/src/main/java/org/chorem/pollen/services/service/security/{PollenAuthenticationException.java => PollenCypherTechnicalException.java} (80%) copy pollen-services/src/main/resources/email/{UserAccountCreatedEmail.mustache => ResendValidationEmail.mustache} (76%) copy pollen-services/src/main/resources/email/{UserAccountCreatedEmail_fr.mustache => ResendValidationEmail_fr.mustache} (77%) delete mode 100644 pollen-ui-angular/.bowerrc delete mode 100644 pollen-ui-angular/INSTALL.txt delete mode 100644 pollen-ui-angular/LICENSE.txt delete mode 100644 pollen-ui-angular/bower.json delete mode 100644 pollen-ui-angular/package.json delete mode 100644 pollen-ui-angular/pom.xml delete mode 100644 pollen-ui-angular/src/main/version.txt delete mode 100644 pollen-ui-angular/src/main/webapp/i18n/en.js delete mode 100644 pollen-ui-angular/src/main/webapp/i18n/fr.js delete mode 100644 pollen-ui-angular/src/main/webapp/img/chart-icon.png delete mode 100644 pollen-ui-angular/src/main/webapp/img/pie-icon.png delete mode 100644 pollen-ui-angular/src/main/webapp/index.html delete mode 100644 pollen-ui-angular/src/main/webapp/js/app.js delete mode 100644 pollen-ui-angular/src/main/webapp/js/conf.js.example delete mode 100644 pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js delete mode 100644 pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js delete mode 100644 pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js delete mode 100644 pollen-ui-angular/src/main/webapp/js/controllers/mainCtrl.js delete mode 100644 pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js delete mode 100644 pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js delete mode 100644 pollen-ui-angular/src/main/webapp/js/directives.js delete mode 100644 pollen-ui-angular/src/main/webapp/js/libs/ckeditor/config.js delete mode 100644 pollen-ui-angular/src/main/webapp/js/scripts/sticky-inline-poll.js delete mode 100644 pollen-ui-angular/src/main/webapp/js/services.js delete mode 100644 pollen-ui-angular/src/main/webapp/less/style.less delete mode 100644 pollen-ui-angular/src/main/webapp/less/variables.less delete mode 100644 pollen-ui-angular/src/main/webapp/partials/alerts.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/big-poll.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/home.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/inline-poll.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/pagination.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/poll-comment.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/poll-info.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/poll-link.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/poll-list.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/poll-poll.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/poll-result.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/poll-settings.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/poll.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/printResource.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/user-admin-list.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/user-edit-editProfile.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/user-edit-password.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/user-edit-viewProfile.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/user-edit.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/user-login.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/user-register.html delete mode 100644 pollen-ui-angular/src/test/karma.conf.ci.js delete mode 100644 pollen-ui-angular/src/test/karma.conf.js delete mode 100644 pollen-ui-angular/src/test/unit/alertControllersTest.js delete mode 100644 pollen-ui-angular/src/test/unit/pollControllersTest.js delete mode 100644 pollen-ui-js/.gitignore delete mode 100644 pollen-ui-js/README.txt delete mode 100644 pollen-ui-js/changelog.txt delete mode 100644 pollen-ui-js/pom.xml delete mode 100644 pollen-ui-js/src/main/resources/nuiton-js/wro.properties delete mode 100644 pollen-ui-js/src/main/resources/nuiton-js/wro.xml delete mode 100644 pollen-ui-js/src/main/webapp/bundle/Messages.properties delete mode 100644 pollen-ui-js/src/main/webapp/css/bootstrap-datetimepicker.min.css delete mode 100644 pollen-ui-js/src/main/webapp/css/style.css delete mode 100644 pollen-ui-js/src/main/webapp/img/glyphicons_050_link.png delete mode 100644 pollen-ui-js/src/main/webapp/img/pollen.png delete mode 100644 pollen-ui-js/src/main/webapp/index.html delete mode 100644 pollen-ui-js/src/main/webapp/js/controls/menu.js delete mode 100644 pollen-ui-js/src/main/webapp/js/controls/poll_form.js delete mode 100644 pollen-ui-js/src/main/webapp/js/controls/poll_list.js delete mode 100644 pollen-ui-js/src/main/webapp/js/controls/poll_summary.js delete mode 100644 pollen-ui-js/src/main/webapp/js/controls/user_form.js delete mode 100644 pollen-ui-js/src/main/webapp/js/controls/vote.js delete mode 100644 pollen-ui-js/src/main/webapp/js/libs/bootstrap-datetimepicker.min.js delete mode 100644 pollen-ui-js/src/main/webapp/js/libs/jquery.scrollto.js delete mode 100644 pollen-ui-js/src/main/webapp/js/models/choices.js delete mode 100644 pollen-ui-js/src/main/webapp/js/models/comments.js delete mode 100644 pollen-ui-js/src/main/webapp/js/models/polls.js delete mode 100644 pollen-ui-js/src/main/webapp/js/models/users.js delete mode 100644 pollen-ui-js/src/main/webapp/js/models/votes.js delete mode 100644 pollen-ui-js/src/main/webapp/js/pollen-utils.js delete mode 100644 pollen-ui-js/src/main/webapp/js/route.js delete mode 100644 pollen-ui-js/src/main/webapp/views/menu.ejs delete mode 100644 pollen-ui-js/src/main/webapp/views/poll_form.ejs delete mode 100644 pollen-ui-js/src/main/webapp/views/poll_list.ejs delete mode 100644 pollen-ui-js/src/main/webapp/views/summary.ejs delete mode 100644 pollen-ui-js/src/main/webapp/views/user_form.ejs delete mode 100644 pollen-ui-js/src/main/webapp/views/vote.ejs create mode 100644 pollen-ui-riot-js/.eslintrc rename {pollen-ui-angular => pollen-ui-riot-js}/.gitignore (95%) rename {pollen-ui-js => pollen-ui-riot-js}/LICENSE.txt (100%) rename {pollen-ui-angular => pollen-ui-riot-js}/README.md (81%) create mode 100644 pollen-ui-riot-js/package.json create mode 100644 pollen-ui-riot-js/pom.xml create mode 100644 pollen-ui-riot-js/src/main/js/riotjs-loader.js create mode 100644 pollen-ui-riot-js/src/main/web/conf.json create mode 100644 pollen-ui-riot-js/src/main/web/css/main.css create mode 100644 pollen-ui-riot-js/src/main/web/i18n.json rename {pollen-ui-angular/src/main/webapp => pollen-ui-riot-js/src/main/web}/img/en.png (100%) rename {pollen-ui-angular/src/main/webapp => pollen-ui-riot-js/src/main/web}/img/fr.png (100%) rename {pollen-ui-angular/src/main/webapp => pollen-ui-riot-js/src/main/web}/img/pollen.png (100%) rename pollen-ui-angular/src/main/webapp/partials/dateTimePicker.html => pollen-ui-riot-js/src/main/web/index.html (62%) create mode 100644 pollen-ui-riot-js/src/main/web/index.js create mode 100644 pollen-ui-riot-js/src/main/web/js/AuthService.js copy pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java => pollen-ui-riot-js/src/main/web/js/Choice.js (70%) create mode 100644 pollen-ui-riot-js/src/main/web/js/ChoiceService.js create mode 100644 pollen-ui-riot-js/src/main/web/js/CommentService.js create mode 100644 pollen-ui-riot-js/src/main/web/js/FetchService.js create mode 100644 pollen-ui-riot-js/src/main/web/js/FormHelper.js create mode 100644 pollen-ui-riot-js/src/main/web/js/I18nHelper.js create mode 100644 pollen-ui-riot-js/src/main/web/js/Pagination.js create mode 100644 pollen-ui-riot-js/src/main/web/js/PollForm.js create mode 100644 pollen-ui-riot-js/src/main/web/js/PollService.js copy pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenAuthenticationException.java => pollen-ui-riot-js/src/main/web/js/ResultService.js (60%) create mode 100644 pollen-ui-riot-js/src/main/web/js/Session.js copy pollen-services/src/main/java/org/chorem/pollen/services/bean/package-info.java => pollen-ui-riot-js/src/main/web/js/Singleton.js (68%) create mode 100644 pollen-ui-riot-js/src/main/web/js/UserService.js copy pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenAuthenticationException.java => pollen-ui-riot-js/src/main/web/js/VoteCountingTypeService.js (59%) create mode 100644 pollen-ui-riot-js/src/main/web/js/VoteService.js create mode 100644 pollen-ui-riot-js/src/main/web/robots.txt create mode 100644 pollen-ui-riot-js/src/main/web/tag/Footer.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/Header.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/HeaderI18n.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/Home.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/Pagination.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/Pollen.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/SignCheck.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/SignIn.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/SignUp.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/Users.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/ChoiceDate.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/ChoiceText.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Choices.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/CommentPopup.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/CreatePoll.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Created.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Description.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Results.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Voters.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/popup/AccountCreated.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/popup/NewPassword.tag create mode 100644 pollen-ui-riot-js/src/main/web/tag/popup/ResendValidation.tag rename {pollen-ui-angular => pollen-ui-riot-js}/src/main/webapp/WEB-INF/web.xml (91%) create mode 100644 pollen-ui-riot-js/webpack.config.js -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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>.
participants (1)
-
chorem.org scm