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 bdf3b65c0adc1c303d8b183f3652c4b0848d0430 Merge: ba5e6006 f5608178 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 28 15:18:50 2017 +0000 Merge branch 'release/3.0.0' .gitlab-ci.yml | 137 ++ CHANGELOG | 23 + Dockerfile | 53 + README.txt => README.md | 33 + changelog.txt | 46 - pollen-persistence/{README.txt => README.md} | 0 pollen-persistence/changelog.txt | 4 - pollen-persistence/pom.xml | 44 +- .../org/chorem/pollen/persistence/DaoUtils.java | 70 + .../persistence/PollenFlywayServiceImpl.java | 50 + .../persistence/PollenPersistenceContext.java | 4 +- .../persistence/PollenTopiaApplicationContext.java | 14 +- .../persistence/PollenTopiaPersistenceContext.java | 17 +- ...opiaDao.java => ChildFavoriteListTopiaDao.java} | 21 +- .../pollen/persistence/entity/ChoiceTopiaDao.java | 11 +- .../pollen/persistence/entity/CommentTopiaDao.java | 6 +- .../entity/FavoriteListMemberTopiaDao.java | 63 + .../persistence/entity/FavoriteListTopiaDao.java | 33 +- .../pollen/persistence/entity/PollTopiaDao.java | 127 +- .../entity/PollenPrincipalTopiaDao.java | 5 +- .../persistence/entity/PollenPrincipals.java | 6 +- .../persistence/entity/PollenResourceTopiaDao.java | 12 +- .../{PollenUsers.java => PollenUserImpl.java} | 16 +- .../persistence/entity/PollenUserTopiaDao.java | 47 +- .../pollen/persistence/entity/PollenUsers.java | 4 +- .../chorem/pollen/persistence/entity/Polls.java | 47 +- .../pollen/persistence/entity/ReportResume.java | 64 + .../pollen/persistence/entity/ReportTopiaDao.java | 47 + .../persistence/entity/SessionTokenTopiaDao.java | 5 +- .../persistence/entity/UserCredentialTopiaDao.java | 51 + .../pollen/persistence/entity/VoteToChoices.java | 7 +- .../pollen/persistence/entity/VoteTopiaDao.java | 17 +- ...tTopiaDao.java => VoterListMemberTopiaDao.java} | 28 +- .../persistence/entity/VoterListTopiaDao.java | 18 +- .../h2/V3_0_0_10__add_general_terms_of_use.sql | 3 + .../h2/V3_0_0_1__add_feed_content_in_poll.sql | 2 + .../migration/h2/V3_0_0_2__add_email_to_resend.sql | 10 + .../db/migration/h2/V3_0_0_3__add_reports.sql | 11 + .../migration/h2/V3_0_0_4__add_banned_in_user.sql | 3 + .../h2/V3_0_0_5__add_type_in_resource.sql | 4 + .../h2/V3_0_0_6__remove_close_on_poll.sql | 3 + ...omment_and_new_choice_notifications_in_poll.sql | 6 + .../db/migration/h2/V3_0_0_8__add_credentials.sql | 14 + .../migration/h2/V3_0_0_9__add_loginproviders.sql | 13 + .../V3_0_0_10__add_general_terms_of_use.sql | 3 + .../V3_0_0_1__add_feed_content_in_poll.sql | 2 + .../postgresql/V3_0_0_2__add_email_to_resend.sql | 10 + .../migration/postgresql/V3_0_0_3__add_reports.sql | 11 + .../postgresql/V3_0_0_4__add_banned_in_user.sql | 3 + .../postgresql/V3_0_0_5__add_type_in_resource.sql | 4 + .../postgresql/V3_0_0_6__remove_close_on_poll.sql | 3 + ...omment_and_new_choice_notifications_in_poll.sql | 6 + .../postgresql/V3_0_0_8__add_credentials.sql | 13 + .../postgresql/V3_0_0_9__add_loginproviders.sql | 12 + pollen-persistence/src/main/xmi/pollen.properties | 14 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 20954 -> 28355 bytes .../src/test/resources/db.properties | 4 +- .../src/test/resources/log4j.properties | 7 +- pollen-rest-api/{README.txt => README.md} | 0 pollen-rest-api/pom.xml | 131 +- pollen-rest-api/src/it/pom/pom.xml | 8 +- pollen-rest-api/src/jetty/jetty-context.xml | 6 +- pollen-rest-api/src/license/THIRD-PARTY.properties | 28 +- .../org/chorem/pollen/rest/api/JsonHelper.java | 276 --- .../org/chorem/pollen/rest/api/PollenRender.java | 80 - .../pollen/rest/api/PollenRestApiApplication.java | 105 ++ .../rest/api/PollenRestApiApplicationContext.java | 41 +- .../rest/api/PollenRestApiApplicationListener.java | 132 +- .../rest/api/PollenRestApiRequestContext.java | 72 - .../rest/api/PollenRestApiRequestFilter.java | 244 ++- .../chorem/pollen/rest/api/PollenRestApiUtil.java | 72 - .../rest/api/PollenTopiaTransactionFilter.java | 16 +- .../pollen/rest/api/beans/ChangePasswordBean.java | 34 +- .../pollen/rest/api/beans/PollCreateBean.java | 75 + .../pollen/rest/api/beans/Resource64Bean.java | 59 +- .../pollen/rest/api/beans/VoterListSaveBean.java | 71 + .../pollen/rest/api/converter/DateConverter.java | 56 - .../pollen/rest/api/converter/JacksonConfig.java | 54 + .../rest/api/converter/JsonArrayConverter.java | 82 - .../pollen/rest/api/converter/JsonConverter.java | 101 - .../api/converter/PollenConverterProvider.java | 50 + .../api/converter/PollenEntityIdConverter.java | 63 + .../api/converter/PollenEntityIdDeserializer.java | 73 + .../api/converter/PollenEntityIdSerializer.java | 46 + .../api/converter/PollenEntityRefDeserializer.java | 82 + .../api/converter/PollenEntityRefSerializer.java | 50 + .../FavoriteListImportExceptionMapper.java | 30 +- .../InvalidEntityLinkExceptionMapper.java | 25 +- .../InvalidFormExceptionMapper.java | 32 +- .../PollenAbstractExceptionMapper.java | 61 + .../PollenAuthenticationExceptionMapper.java | 30 +- .../PollenEmailNotValidatedExceptionMapper.java | 30 +- ...rProviderAccountAlreadyUsedExceptionMapper.java | 37 +- ...InvalidEmailActivationTokenExceptionMapper.java | 25 +- .../PollenInvalidPermissionExceptionMapper.java | 25 +- .../PollenInvalidSessionTokenExceptionMapper.java | 25 +- .../PollenUnauthorizedExceptionMapper.java | 25 +- .../PollenUserBannedExceptionMapper.java | 30 +- .../TopiaNoResultExceptionMapper.java | 25 +- .../rest/api/injector/PollenBeanIdInjector.java | 70 - .../PollenRestApiRequestContextInjector.java | 53 - .../rest/api/injector/PollenServiceInjector.java | 55 - .../org/chorem/pollen/rest/api/v1/ApiUtils.java | 134 ++ .../org/chorem/pollen/rest/api/v1/AuthApi.java | 267 ++- .../org/chorem/pollen/rest/api/v1/ChoiceApi.java | 99 +- .../org/chorem/pollen/rest/api/v1/CommentApi.java | 111 +- .../java/org/chorem/pollen/rest/api/v1/DocApi.java | 23 +- .../org/chorem/pollen/rest/api/v1/ErrorAction.java | 97 - .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 227 ++- .../{VoteCountingTypeApi.java => FeedbackApi.java} | 38 +- .../java/org/chorem/pollen/rest/api/v1/GtuApi.java | 82 + .../org/chorem/pollen/rest/api/v1/PollApi.java | 195 +- .../pollen/rest/api/v1/PollenResourceApi.java | 142 +- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 141 +- .../org/chorem/pollen/rest/api/v1/VoteApi.java | 76 +- .../chorem/pollen/rest/api/v1/VoteCountingApi.java | 38 +- .../pollen/rest/api/v1/VoteCountingTypeApi.java | 27 +- .../chorem/pollen/rest/api/v1/VoterListApi.java | 167 +- .../src/main/resources/log4j.properties | 8 +- pollen-rest-api/src/main/resources/mapping | 108 +- .../src/main/resources/pollen-rest-api.properties | 10 +- pollen-rest-api/src/main/webapp/WEB-INF/web.xml | 21 +- 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 | 31 +- .../pollen/rest/api/AbstractPollenRestApiTest.java | 108 +- .../org/chorem/pollen/rest/api/AuthApiTest.java | 44 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 114 +- .../chorem/pollen/rest/api/PollenUserApiTest.java | 82 +- .../chorem/pollen/rest/api/RestApiFixtures.java | 64 + .../rest/api/converter/JsonArrayConverterTest.java | 55 - .../rest/api/converter/JsonConverterTest.java | 91 - .../src/test/resources/log4j.properties | 7 +- .../test/resources/pollen-rest-api-test.properties | 17 +- .../changelog.txt => pollen-services/README.md | 0 pollen-services/pom.xml | 113 +- pollen-services/src/main/config/PollenServices.ini | 208 +++ .../services/DefaultPollenServiceContext.java | 43 +- .../pollen/services/PollenApplicationContext.java | 8 +- .../org/chorem/pollen/services/PollenFixtures.java | 12 +- .../org/chorem/pollen/services/PollenService.java | 6 +- .../pollen/services/PollenServiceContext.java | 14 +- .../pollen/services/PollenTechnicalException.java | 4 +- .../chorem/pollen/services/PollenUIContext.java | 110 ++ .../pollen/services/TopiaEntityCopyVisitor.java | 17 +- .../java/org/chorem/pollen/services/UnitHuman.java | 64 + ...terListBean.java => ChildFavoriteListBean.java} | 43 +- .../chorem/pollen/services/bean/ChoiceBean.java | 68 +- .../pollen/services/bean/ChoiceScoreBean.java | 4 +- .../chorem/pollen/services/bean/CommentBean.java | 14 +- .../pollen/services/bean/FavoriteListBean.java | 24 +- .../services/bean/FavoriteListMemberBean.java | 15 +- .../chorem/pollen/services/bean/FeedbackBean.java | 154 ++ .../bean/{package-info.java => GtuMetaBean.java} | 28 +- ...ltBean.java => ListVoteCountingResultBean.java} | 25 +- .../pollen/services/bean/LoginProviderBean.java | 103 ++ .../services/bean/PaginationParameterBean.java | 16 +- .../pollen/services/bean/PaginationResultBean.java | 59 +- .../org/chorem/pollen/services/bean/PollBean.java | 241 ++- .../chorem/pollen/services/bean/PollenBean.java | 40 +- .../chorem/pollen/services/bean/PollenBeans.java | 15 +- .../pollen/services/bean/PollenEntityId.java | 42 +- .../pollen/services/bean/PollenEntityRef.java | 38 +- .../pollen/services/bean/PollenUserBean.java | 68 +- ...FavoriteListMemberBean.java => ReportBean.java} | 76 +- .../bean/{package-info.java => ReportLevel.java} | 41 +- .../pollen/services/bean/ReportResumeBean.java | 74 + .../pollen/services/bean/ResourceFileBean.java | 18 +- .../pollen/services/bean/ResourceMetaBean.java | 28 +- .../pollen/services/bean/ResourceStreamBean.java | 2 +- .../pollen/services/bean/UserCredentialBean.java | 81 + .../org/chorem/pollen/services/bean/VoteBean.java | 59 +- .../services/bean/VoteCountingGroupResultBean.java | 6 +- .../services/bean/VoteCountingResultBean.java | 16 +- .../pollen/services/bean/VoteCountingTypeBean.java | 32 +- .../pollen/services/bean/VoteToChoiceBean.java | 10 +- .../chorem/pollen/services/bean/VoterListBean.java | 40 +- .../pollen/services/bean/VoterListMemberBean.java | 31 +- .../bean/export/ChildFavoriteListExport.java | 92 + .../export/ExportBean.java} | 48 +- .../services/bean/export/FavoriteListExport.java | 98 + .../FavoriteListMemberExport.java} | 48 +- .../services/bean/export/FavoriteListsExport.java | 57 + .../chorem/pollen/services/bean/package-info.java | 6 +- .../Coombs/CoombsDetailResultBean.java | 59 + .../bean/voteCounting/Coombs/CoombsRoundBean.java | 83 + .../Coombs/CoombsRoundChoiceBean.java} | 62 +- .../InstantRunoffDetailResultBean.java | 59 + .../InstantRunoff/InstantRunoffRoundBean.java | 83 + .../InstantRunoffRoundChoiceBean.java | 70 + .../voteCounting/VoteCountingDetailResultBean.java | 74 + .../voteCounting/borda/BordaChoiceRankBean.java | 79 + .../voteCounting/borda/BordaDetailResultBean.java | 59 + .../condorcet/CondorcetBattleBean.java | 85 + .../condorcet/CondorcetDetailResultBean.java | 59 + .../services/config/PollenServiceConfig.java | 254 --- .../services/config/PollenServiceConfigOption.java | 309 ---- .../services/config/PollenServicesConfig.java | 161 ++ .../pollen/services/config/package-info.java | 6 +- .../AbstractPollenJob.java} | 30 +- .../pollen/services/job/SendEmailInErrorsJob.java | 60 + .../services/job/SendPollEndReminderJob.java | 88 + .../org/chorem/pollen/services/package-info.java | 6 +- .../pollen/services/service/ChoiceService.java | 143 +- .../pollen/services/service/CommentService.java | 85 +- .../chorem/pollen/services/service/ErrorMap.java | 10 +- .../services/service/FavoriteListImport.java | 4 +- .../service/FavoriteListImportException.java | 25 +- .../service/FavoriteListImportFromFile.java | 139 +- .../service/FavoriteListImportFromLdap.java | 137 +- .../services/service/FavoriteListService.java | 722 +++++++- .../pollen/services/service/FeedService.java | 194 ++ .../pollen/services/service/FeedbackService.java | 59 + .../pollen/services/service/FixturesService.java | 16 +- .../chorem/pollen/services/service/GtuService.java | 127 ++ .../service/InvalidEntityLinkException.java | 4 +- .../services/service/InvalidFormException.java | 6 +- .../services/service/NotificationService.java | 328 +++- .../pollen/services/service/PollService.java | 348 ++-- .../services/service/PollenResourceService.java | 120 +- .../services/service/PollenServiceSupport.java | 189 +- .../services/service/PollenUIUrlRenderService.java | 94 +- .../pollen/services/service/PollenUserService.java | 213 +-- .../pollen/services/service/ReportService.java | 208 +++ .../pollen/services/service/SocialAuthService.java | 259 +++ .../services/service/VoteCountingService.java | 147 +- .../services/service/VoteCountingTypeService.java | 27 +- .../pollen/services/service/VoteService.java | 267 +-- .../pollen/services/service/VoterListService.java | 753 +++++--- ...lCreatedEmail.java => AbstractReportEmail.java} | 62 +- .../service/mail/AbstractReportForAdminEmail.java | 70 + ...PollClosedEmail.java => AbstractVoteEmail.java} | 29 +- .../services/service/mail/ChoiceAddedEmail.java | 4 +- .../services/service/mail/ChoiceDeletedEmail.java | 4 +- .../services/service/mail/ChoiceEditedEmail.java | 4 +- ...oiceEditedEmail.java => ChoiceReportEmail.java} | 36 +- ...edEmail.java => ChoiceReportForAdminEmail.java} | 36 +- .../services/service/mail/CommentAddedEmail.java | 4 +- .../services/service/mail/CommentDeletedEmail.java | 4 +- .../services/service/mail/CommentEditedEmail.java | 4 +- ...ollClosedEmail.java => CommentReportEmail.java} | 26 +- ...dEmail.java => CommentReportForAdminEmail.java} | 26 +- .../pollen/services/service/mail/EmailService.java | 511 ++++-- .../services/service/mail/FeedbackEmail.java | 93 + .../services/service/mail/LostPasswordEmail.java | 4 +- .../service/mail/PollChoicePeriodEndedEmail.java | 4 +- .../service/mail/PollChoicePeriodStartedEmail.java | 4 +- .../services/service/mail/PollClosedEmail.java | 4 +- .../services/service/mail/PollCreatedEmail.java | 13 +- ...lClosedEmail.java => PollEndReminderEmail.java} | 19 +- ...vitationEmail.java => PollInvitationEmail.java} | 40 +- .../{PollClosedEmail.java => PollReportEmail.java} | 24 +- ...osedEmail.java => PollReportForAdminEmail.java} | 24 +- .../service/mail/PollVotePeriodEndedEmail.java | 4 +- .../service/mail/PollVotePeriodStartedEmail.java | 4 +- .../service/mail/PollVoteReminderEmail.java | 4 +- .../pollen/services/service/mail/PollenMail.java | 35 +- ...reatedEmail.java => ResendValidationEmail.java} | 28 +- .../mail/RestrictedPollInvitationEmail.java | 42 +- .../service/mail/UserAccountCreatedEmail.java | 16 +- ...va => UserAccountCreatedFromProviderEmail.java} | 42 +- ...wordEmail.java => UserAccountDeletedEmail.java} | 46 +- ...swordEmail.java => UserAccountEditedEmail.java} | 49 +- ...il.java => UserAccountEmailValidatedEmail.java} | 28 +- ...l.java => UserAccountPasswordChangedEmail.java} | 28 +- .../services/service/mail/VoteAddedEmail.java | 29 +- .../services/service/mail/VoteDeletedEmail.java | 29 +- .../services/service/mail/VoteEditedEmail.java | 32 +- .../pollen/services/service/package-info.java | 6 +- .../security/DefaultPollenSecurityContext.java | 8 +- ...on.java => MissingAuthenticationException.java} | 8 +- .../services/service/security/PermissionVerb.java | 6 +- .../security/PollenAuthenticationException.java | 8 +- ...on.java => PollenCypherTechnicalException.java} | 14 +- ....java => PollenEmailNotValidatedException.java} | 15 +- ...mailOrProviderAccountAlreadyUsedException.java} | 17 +- ...PollenInvalidEmailActivationTokenException.java | 6 +- .../security/PollenInvalidPasswordException.java | 6 +- .../security/PollenInvalidPermissionException.java | 4 +- .../PollenInvalidSessionTokenException.java | 6 +- .../service/security/PollenSecurityContext.java | 7 +- .../service/security/PollenSecurityRealm.java | 16 +- .../security/PollenUnauthorizedException.java | 4 +- ...ception.java => PollenUserBannedException.java} | 15 +- .../services/service/security/SecurityService.java | 374 +++- .../test/FakePollenApplicationContext.java | 57 +- .../services/test/FakePollenSecurityContext.java | 4 +- .../services/test/FakePollenServiceContext.java | 12 +- .../src/main/resources/default.jpg | Bin .../main/resources/email/ChoiceAddedEmail.mustache | 3 + .../resources/email/ChoiceAddedEmail_fr.mustache | 3 + .../resources/email/ChoiceReportEmail.mustache | 8 + .../resources/email/ChoiceReportEmail_fr.mustache | 8 + .../email/ChoiceReportForAdminEmail.mustache | 14 + .../email/ChoiceReportForAdminEmail_fr.mustache | 14 + .../resources/email/CommentAddedEmail.mustache | 3 + .../resources/email/CommentAddedEmail_fr.mustache | 3 + .../resources/email/CommentDeletedEmail.mustache | 3 + .../email/CommentDeletedEmail_fr.mustache | 3 + .../resources/email/CommentEditedEmail.mustache | 3 + .../resources/email/CommentEditedEmail_fr.mustache | 3 + .../resources/email/CommentReportEmail.mustache | 8 + .../resources/email/CommentReportEmail_fr.mustache | 8 + .../email/CommentReportForAdminEmail.mustache | 14 + .../email/CommentReportForAdminEmail_fr.mustache | 14 + .../main/resources/email/FeedbackEmail.mustache | 32 + .../main/resources/email/FeedbackEmail_fr.mustache | 32 + .../resources/email/LostPasswordEmail.mustache | 2 +- .../resources/email/LostPasswordEmail_fr.mustache | 2 +- .../email/PollChoicePeriodEndedEmail_fr.mustache} | 0 .../main/resources/email/PollCreatedEmail.mustache | 4 +- .../resources/email/PollCreatedEmail_fr.mustache | 4 +- .../resources/email/PollEndReminderEmail.mustache | 5 + .../email/PollEndReminderEmail_fr.mustache | 5 + .../resources/email/PollInvitationEmail.mustache | 21 + .../email/PollInvitationEmail_fr.mustache | 20 + .../main/resources/email/PollReportEmail.mustache | 8 + .../resources/email/PollReportEmail_fr.mustache | 8 + .../email/PollReportForAdminEmail.mustache | 14 + .../email/PollReportForAdminEmail_fr.mustache | 14 + .../resources/email/ResendValidationEmail.mustache | 7 + .../email/ResendValidationEmail_fr.mustache | 7 + .../email/RestrictedPollInvitationEmail.mustache | 21 + .../RestrictedPollInvitationEmail_fr.mustache | 22 + .../email/UserAccountCreatedEmail.mustache | 7 +- .../email/UserAccountCreatedEmail_fr.mustache | 5 +- .../UserAccountCreatedFromProviderEmail.mustache | 10 + ...UserAccountCreatedFromProviderEmail_fr.mustache | 11 + .../email/UserAccountDeletedEmail.mustache | 3 + .../email/UserAccountDeletedEmail_fr.mustache | 3 + .../email/UserAccountEditedEmail.mustache | 6 + .../email/UserAccountEditedEmail_fr.mustache | 6 + .../email/UserAccountEmailValidatedEmail.mustache | 3 + .../UserAccountEmailValidatedEmail_fr.mustache | 3 + .../email/UserAccountPasswordChangedEmail.mustache | 3 + .../UserAccountPasswordChangedEmail_fr.mustache | 3 + .../main/resources/email/VoteAddedEmail.mustache | 8 + .../resources/email/VoteAddedEmail_fr.mustache | 8 + .../main/resources/email/VoteDeletedEmail.mustache | 8 + .../resources/email/VoteDeletedEmail_fr.mustache | 8 + .../main/resources/email/VoteEditedEmail.mustache | 8 + .../resources/email/VoteEditedEmail_fr.mustache | 8 + .../src/main/resources/email/signing.mustache | 6 + .../src/main/resources/email/signing_fr.mustache | 6 + pollen-services/src/main/resources/fixtures.yaml | 10 +- .../i18n/pollen-services_en_GB.properties | 137 +- .../i18n/pollen-services_fr_FR.properties | 158 +- .../src/main/resources/oauth_consumer.properties | 107 ++ .../pollen/services/AbstractPollenServiceTest.java | 9 +- .../services/service/FavoriteListServiceTest.java | 125 +- .../pollen/services/service/PollServiceTest.java | 60 +- .../service/PollenUIUrlRenderServiceTest.java | 61 +- .../services/service/PollenUserServiceTest.java | 55 +- .../services/service/VoteCountingServiceTest.java | 14 +- .../pollen/services/service/VoteServiceTest.java | 4 +- .../services/service/VoterListServiceTest.java | 148 +- .../src/test/resources/log4j.properties | 7 +- .../src/test/resources/pollen-services.properties | 7 +- pollen-ui-angular/.bowerrc | 5 - pollen-ui-angular/INSTALL.txt | 17 - pollen-ui-angular/bower.json | 30 - pollen-ui-angular/changelog.txt | 40 - pollen-ui-angular/package.json | 22 - pollen-ui-angular/pom.xml | 227 --- pollen-ui-angular/src/main/version.txt | 1 - pollen-ui-angular/src/main/webapp/i18n/en.js | 329 ---- pollen-ui-angular/src/main/webapp/i18n/fr.js | 328 ---- .../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 | 194 -- 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 | 1931 -------------------- .../src/main/webapp/js/controllers/userCtrl.js | 288 --- 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 | 488 ----- 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 | 81 - .../main/webapp/partials/favoriteList-edit.html | 84 - .../main/webapp/partials/favoriteList-list.html | 34 - .../src/main/webapp/partials/inline-poll.html | 148 -- .../src/main/webapp/partials/pagination.html | 33 - .../src/main/webapp/partials/poll-comment.html | 98 - .../src/main/webapp/partials/poll-info.html | 70 - .../src/main/webapp/partials/poll-link.html | 92 - .../src/main/webapp/partials/poll-list.html | 48 - .../main/webapp/partials/poll-listParticipant.html | 119 -- .../src/main/webapp/partials/poll-poll.html | 54 - .../src/main/webapp/partials/poll-popupChoice.html | 76 - .../src/main/webapp/partials/poll-result.html | 91 - .../src/main/webapp/partials/poll-settings.html | 309 ---- .../src/main/webapp/partials/poll.html | 69 - .../src/main/webapp/partials/user-admin-list.html | 60 - .../webapp/partials/user-edit-editProfile.html | 67 - .../main/webapp/partials/user-edit-password.html | 66 - .../webapp/partials/user-edit-viewProfile.html | 46 - .../src/main/webapp/partials/user-edit.html | 31 - .../src/main/webapp/partials/user-login.html | 52 - .../main/webapp/partials/user-lostPassword.html | 45 - .../src/main/webapp/partials/user-register.html | 87 - 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 | 518 ------ pollen-ui-js/.gitignore | 2 - pollen-ui-js/LICENSE.txt | 661 ------- 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 | 3 +- .../LICENSE.txt | 0 .../README.txt => pollen-ui-riot-js/README.md | 6 - pollen-ui-riot-js/package.json | 57 + .../jetty-context.xml => pollen-ui-riot-js/pom.xml | 27 +- pollen-ui-riot-js/src/main/js/riotjs-loader.js | 61 + .../src/main/web/conf.js | 23 +- pollen-ui-riot-js/src/main/web/css/Pacifico.ttf | Bin 0 -> 75568 bytes pollen-ui-riot-js/src/main/web/css/blaze.css | 1552 ++++++++++++++++ .../src/main/web/css/custom-code-lutin.css | 79 + pollen-ui-riot-js/src/main/web/css/custom.css | 119 ++ pollen-ui-riot-js/src/main/web/css/main.css | 485 +++++ .../src/main/web/css/print.css | 40 +- .../src/main/web/help/voteCountingTypes-en.html | 30 + .../src/main/web/help/voteCountingTypes-fr.html | 30 + .../src/main/web/help/voteCountingTypes.mp4 | Bin 0 -> 11417582 bytes .../src/main/web/help/voteCountingTypes.webm | Bin 0 -> 10149109 bytes .../src/main/web/home/en.html | 34 +- .../src/main/web/home/fr.html | 34 +- pollen-ui-riot-js/src/main/web/home/lutin.png | Bin 0 -> 622 bytes .../src/main/web/home/style.css | 34 +- pollen-ui-riot-js/src/main/web/homeCL/en.html | 45 + pollen-ui-riot-js/src/main/web/homeCL/fr.html | 45 + pollen-ui-riot-js/src/main/web/homeCL/offers.html | 94 + pollen-ui-riot-js/src/main/web/homeCL/style.css | 65 + pollen-ui-riot-js/src/main/web/homeCL/vote.jpg | Bin 0 -> 470520 bytes pollen-ui-riot-js/src/main/web/i18n/en.json | 585 ++++++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 585 ++++++ .../src/main/web}/img/en.png | Bin pollen-ui-riot-js/src/main/web/img/favicon.png | Bin 0 -> 799 bytes pollen-ui-riot-js/src/main/web/img/favicon.svg | 91 + .../src/main/web}/img/fr.png | Bin pollen-ui-riot-js/src/main/web/img/logo.png | Bin 0 -> 10506 bytes .../src/main/web}/img/pollen.png | Bin pollen-ui-riot-js/src/main/web/index.html | 40 + pollen-ui-riot-js/src/main/web/index.js | 30 + pollen-ui-riot-js/src/main/web/js/AuthService.js | 117 ++ .../src/main/web/js/Choice.js | 31 +- pollen-ui-riot-js/src/main/web/js/ChoiceService.js | 70 + .../src/main/web/js/CommentService.js | 79 + .../src/main/web/js/FavoriteListService.js | 116 ++ .../src/main/web/js/FeedbackService.js | 32 +- pollen-ui-riot-js/src/main/web/js/FetchService.js | 140 ++ pollen-ui-riot-js/src/main/web/js/I18nHelper.js | 82 + pollen-ui-riot-js/src/main/web/js/Logger.js | 52 + pollen-ui-riot-js/src/main/web/js/Message.js | 47 + pollen-ui-riot-js/src/main/web/js/PageTracker.js | 97 + .../src/main/web/js/Pagination.js | 28 +- pollen-ui-riot-js/src/main/web/js/Poll.js | 410 +++++ pollen-ui-riot-js/src/main/web/js/PollForm.js | 328 ++++ pollen-ui-riot-js/src/main/web/js/PollService.js | 132 ++ .../src/main/web/js/PollenBus.js | 27 +- .../src/main/web/js/ResourceService.js | 76 + .../src/main/web/js/ResultService.js | 35 +- pollen-ui-riot-js/src/main/web/js/Session.js | 212 +++ .../src/main/web/js/Singleton.js | 30 +- pollen-ui-riot-js/src/main/web/js/UIHelper.js | 108 ++ pollen-ui-riot-js/src/main/web/js/UserService.js | 86 + .../src/main/web/js/VoteCountingTypeService.js | 45 +- pollen-ui-riot-js/src/main/web/js/VoteService.js | 64 + .../src/main/web/js/VoterListService.js | 324 ++++ pollen-ui-riot-js/src/main/web/robots.txt | 2 + .../src/main/web/tag/HeaderI18n.tag.html | 59 + .../src/main/web/tag/Home.tag.html | 45 +- .../src/main/web/tag/Pagination.tag.html | 200 ++ pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 337 ++++ .../src/main/web/tag/PollenFooter.tag.html | 63 + .../src/main/web/tag/PollenHeader.tag.html | 182 ++ .../src/main/web/tag/PollenMessageManager.tag.html | 88 + .../src/main/web/tag/PollenWaiter.tag.html | 50 + .../src/main/web/tag/Privacy.tag.html | 49 + pollen-ui-riot-js/src/main/web/tag/QrCode.tag.html | 64 + .../src/main/web/tag/SignCheck.tag.html | 90 + pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 204 +++ pollen-ui-riot-js/src/main/web/tag/SignUp.tag.html | 220 +++ .../src/main/web/tag/UserProfile.tag.html | 315 ++++ .../src/main/web/tag/admin/GtuCard.tag.html | 142 ++ .../src/main/web/tag/admin/Gtus.tag.html | 106 ++ .../src/main/web/tag/admin/LoginProviders.tag.html | 184 ++ .../src/main/web/tag/admin/UserCard.tag.html | 131 ++ .../src/main/web/tag/admin/UserEditModal.tag.html | 122 ++ .../src/main/web/tag/admin/Users.tag.html | 113 ++ .../src/main/web/tag/components/Card.tag.html | 116 ++ .../src/main/web/tag/components/Checkbox.tag.html | 65 + .../web/tag/components/ContextualMenu.tag.html | 85 + .../main/web/tag/components/GtuValidation.tag.html | 59 + .../main/web/tag/components/HumanInput.tag.html | 57 + .../src/main/web/tag/components/LazyLoad.tag.html | 95 + .../main/web/tag/components/LetterAvatar.tag.html | 76 + .../main/web/tag/components/LoadingCard.tag.html | 59 + .../web/tag/components/MultiLineLabel.tag.html | 29 +- .../src/main/web/tag/components/Search.tag.html | 62 + .../main/web/tag/components/date-picker.tag.html | 255 +++ .../web/tag/components/date-time-picker.tag.html | 98 + .../main/web/tag/components/time-picker.tag.html | 153 ++ .../web/tag/favoriteList/ChildListCard.tag.html | 87 + .../tag/favoriteList/ChildListEditModal.tag.html | 125 ++ .../web/tag/favoriteList/FavoriteList.tag.html | 240 +++ .../web/tag/favoriteList/FavoriteListCard.tag.html | 81 + .../favoriteList/FavoriteListEditModal.tag.html | 86 + .../web/tag/favoriteList/FavoriteLists.tag.html | 188 ++ .../web/tag/favoriteList/ImportCsvModal.tag.html | 87 + .../web/tag/favoriteList/ImportLdapModal.tag.html | 90 + .../main/web/tag/favoriteList/MemberCard.tag.html | 83 + .../web/tag/favoriteList/MemberEditModal.tag.html | 111 ++ .../src/main/web/tag/poll/Choice.tag.html | 336 ++++ .../src/main/web/tag/poll/ChoiceView.tag.html | 165 ++ .../src/main/web/tag/poll/Choices.tag.html | 121 ++ .../src/main/web/tag/poll/Comments.tag.html | 481 +++++ .../src/main/web/tag/poll/Description.tag.html | 113 ++ .../src/main/web/tag/poll/EditPoll.tag.html | 217 +++ .../src/main/web/tag/poll/Podium.tag.html | 95 + .../src/main/web/tag/poll/Poll.tag.html | 285 +++ .../src/main/web/tag/poll/PollCard.tag.html | 159 ++ .../src/main/web/tag/poll/Polls.tag.html | 165 ++ .../src/main/web/tag/poll/Report.tag.html | 208 +++ .../src/main/web/tag/poll/Results.tag.html | 108 ++ .../src/main/web/tag/poll/Settings.tag.html | 564 ++++++ .../src/main/web/tag/poll/Summary.tag.html | 167 ++ .../src/main/web/tag/poll/Votes.tag.html | 773 ++++++++ .../src/main/web/tag/popup/ConfirmPopup.tag.html | 96 + .../src/main/web/tag/popup/FeedbackModal.tag.html | 190 ++ .../src/main/web/tag/popup/GtuChangeModal.tag.html | 56 + .../main/web/tag/popup/InformationPopup.tag.html | 87 + .../src/main/web/tag/popup/Modal.tag.html | 128 ++ .../src/main/web/tag/popup/NewPassword.tag.html | 71 + .../src/main/web/tag/popup/QrCodeButton.tag.html | 86 + .../main/web/tag/popup/ResendValidation.tag.html | 67 + .../voteCountingType/BordaDetailResult.tag.html | 103 ++ .../CondorcetDetailResult.tag.html | 106 ++ .../voteCountingType/CoombsDetailResult.tag.html | 117 ++ .../InstantRunoffDetailResult.tag.html | 89 + .../tag/voterList/ImportFavoritListModal.tag.html | 62 + .../src/main/web/tag/voterList/VoterList.tag.html | 206 +++ .../main/web/tag/voterList/VoterListCard.tag.html | 102 ++ .../web/tag/voterList/VoterListEditModal.tag.html | 97 + .../web/tag/voterList/VoterListMemberCard.tag.html | 101 + .../voterList/VoterListMemberEditModal.tag.html | 109 ++ .../src/main/webapp/WEB-INF/web.xml | 8 +- pollen-ui-riot-js/webpack.config.js | 74 + .../README.md | 0 pollen-votecounting-aggregator/pom.xml | 26 +- .../README.md | 0 pollen-votecounting-api/pom.xml | 26 +- .../pollen/votecounting/AbstractVoteCounting.java | 16 +- .../votecounting/AbstractVoteCountingStrategy.java | 80 +- .../chorem/pollen/votecounting/VoteCounting.java | 40 +- .../pollen/votecounting/VoteCountingFactory.java | 16 +- .../pollen/votecounting/VoteCountingNotFound.java | 8 +- .../pollen/votecounting/VoteCountingStrategy.java | 24 +- .../pollen/votecounting/model/ChoiceIdAble.java | 10 +- .../pollen/votecounting/model/ChoiceScore.java | 57 +- .../votecounting/model/ChoiceToVoteRenderType.java | 8 +- .../votecounting/model/GroupOfVoterBuilder.java | 92 - .../model/{GroupOfVoter.java => ListOfVoter.java} | 42 +- ...tingResult.java => ListVoteCountingResult.java} | 45 +- .../pollen/votecounting/model/SimpleVoter.java | 8 +- .../votecounting/model/SimpleVoterBuilder.java | 10 +- .../model/VoteCountingDetailResult.java | 24 +- .../votecounting/model/VoteCountingResult.java | 23 +- .../pollen/votecounting/model/VoteForChoice.java | 8 +- .../chorem/pollen/votecounting/model/Voter.java | 8 +- .../pollen/votecounting/model/VoterBuilder.java | 16 +- .../i18n/pollen-votecounting-api_fr_FR.properties | 2 +- .../votecounting/VoteCountingFactoryTest.java | 8 +- .../src/test/resources/log4j.properties | 6 +- .../README.md | 0 pollen-votecounting-borda/pom.xml | 31 +- .../pollen/votecounting/BordaChoiceRank.java | 74 + .../pollen/votecounting/BordaDetailResult.java | 39 +- .../pollen/votecounting/BordaVoteCounting.java | 23 +- .../votecounting/BordaVoteCountingStrategy.java | 51 +- .../pollen-votecounting-borda_en_GB.properties | 6 +- .../pollen-votecounting-borda_fr_FR.properties | 6 +- .../BordaVoteCountingStrategyTest.java | 369 ++-- .../votecounting/VoteCountingFactoryTest.java | 8 +- .../src/test/resources/log4j.properties | 6 +- .../README.md | 0 pollen-votecounting-condorcet/changelog.txt | 0 pollen-votecounting-condorcet/pom.xml | 31 +- .../pollen/votecounting/CondorcetBattle.java | 74 + .../pollen/votecounting/CondorcetDetailResult.java | 39 +- .../pollen/votecounting/CondorcetVoteCounting.java | 23 +- .../CondorcetVoteCountingStrategy.java | 74 +- .../pollen-votecounting-condorcet_en_GB.properties | 6 +- .../pollen-votecounting-condorcet_fr_FR.properties | 6 +- .../CondorcetVoteCountingStrategyTest.java | 502 +++-- .../votecounting/VoteCountingFactoryTest.java | 8 +- .../src/test/resources/log4j.properties | 6 +- .../README.md | 0 pollen-votecounting-coombs/README.txt | 0 pollen-votecounting-coombs/changelog.txt | 0 pollen-votecounting-coombs/pom.xml | 31 +- .../pollen/votecounting/CoombsDetailResult.java | 39 +- .../chorem/pollen/votecounting/CoombsRound.java | 61 + .../pollen/votecounting/CoombsRoundChoice.java | 85 + .../pollen/votecounting/CoombsVoteCounting.java | 25 +- .../votecounting/CoombsVoteCountingStrategy.java | 98 +- .../pollen-votecounting-coombs_en_GB.properties | 6 +- .../pollen-votecounting-coombs_fr_FR.properties | 6 +- .../CoombsVoteCountingStrategyTest.java | 322 ++-- .../votecounting/VoteCountingFactoryTest.java | 8 +- .../src/test/resources/log4j.properties | 6 +- .../README.md | 0 pollen-votecounting-instant-runoff/README.txt | 0 pollen-votecounting-instant-runoff/changelog.txt | 0 pollen-votecounting-instant-runoff/pom.xml | 31 +- .../votecounting/InstantRunoffDetailResult.java | 39 +- .../pollen/votecounting/InstantRunoffRound.java | 61 + .../votecounting/InstantRunoffRoundChoice.java | 55 +- .../votecounting/InstantRunoffVoteCounting.java | 27 +- .../InstantRunoffVoteCountingStrategy.java | 94 +- ...en-votecounting-instant-runoff_en_GB.properties | 6 +- ...en-votecounting-instant-runoff_fr_FR.properties | 6 +- .../InstantRunoffVoteCountingStrategyTest.java | 339 ++-- .../votecounting/VoteCountingFactoryTest.java | 8 +- .../src/test/resources/log4j.properties | 6 +- .../README.md | 0 pollen-votecounting-normal/README.txt | 0 pollen-votecounting-normal/changelog.txt | 0 pollen-votecounting-normal/pom.xml | 32 +- .../pollen/votecounting/NormalVoteCounting.java | 23 +- .../votecounting/NormalVoteCountingStrategy.java | 29 +- .../NormalVoteCountingStrategyTest.java | 379 ++-- .../votecounting/VoteCountingFactoryTest.java | 8 +- .../src/test/resources/log4j.properties | 6 +- .../README.md | 0 pollen-votecounting-number/README.txt | 0 pollen-votecounting-number/changelog.txt | 0 pollen-votecounting-number/pom.xml | 31 +- .../pollen/votecounting/NumberVoteCounting.java | 21 +- .../votecounting/NumberVoteCountingStrategy.java | 27 +- .../pollen-votecounting-number_en_GB.properties | 2 +- .../pollen-votecounting-number_fr_FR.properties | 2 +- .../NumberVoteCountingStrategyTest.java | 311 ++-- .../votecounting/VoteCountingFactoryTest.java | 8 +- .../src/test/resources/log4j.properties | 6 +- .../README.md | 0 pollen-votecounting-percentage/README.txt | 0 pollen-votecounting-percentage/changelog.txt | 0 pollen-votecounting-percentage/pom.xml | 31 +- .../votecounting/PercentageVoteCounting.java | 23 +- .../PercentageVoteCountingStrategy.java | 39 +- ...pollen-votecounting-percentage_en_GB.properties | 2 +- ...pollen-votecounting-percentage_fr_FR.properties | 2 +- .../PercentageVoteCountingStrategyTest.java | 329 ++-- .../votecounting/VoteCountingFactoryTest.java | 8 +- .../src/test/resources/log4j.properties | 6 +- pom.xml | 333 +++- src/site/fr/rst/configure.rst | 4 +- src/site/fr/rst/depouillement.rst | 4 +- src/site/fr/rst/index.rst | 4 +- src/site/rst/configure.rst | 4 +- src/site/rst/index.rst | 4 +- src/site/rst/methods.rst | 4 +- src/site/rst/restApi.rst | 2 +- src/site/rst/security.rst | 4 +- src/site/rst/service.rst | 4 +- src/site/rst/tests.rst | 4 +- src/site/site_en.xml | 87 +- src/site/site_fr.xml | 89 +- 709 files changed, 34458 insertions(+), 20170 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.