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 a59ea62216bc6fe05534e6a9988832667898d37c Merge: 8ab5eda8 9f142759 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Sep 29 09:28:09 2017 +0200 Merge branch 'feature/58-limitation-des-votants' into develop .../pollen/persistence/entity/PollTopiaDao.java | 12 ++ .../pollen/persistence/entity/VoteToChoices.java | 15 +- .../pollen/persistence/entity/VoteTopiaDao.java | 11 ++ .../db/migration/h2/V3_1_0_1__add_premium.sql | 8 + .../migration/postgresql/V3_1_0_1__add_premium.sql | 8 + pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 28355 -> 28560 bytes .../org/chorem/pollen/rest/api/AuthApiTest.java | 8 +- .../chorem/pollen/rest/api/PollenUserApiTest.java | 2 +- pollen-services/src/main/config/PollenServices.ini | 8 +- .../chorem/pollen/services/PollenUIContext.java | 10 ++ .../services/bean/ChildFavoriteListBean.java | 23 --- .../chorem/pollen/services/bean/ChoiceBean.java | 29 ---- .../chorem/pollen/services/bean/CommentBean.java | 44 ------ .../pollen/services/bean/FavoriteListBean.java | 20 --- .../services/bean/FavoriteListMemberBean.java | 24 --- .../pollen/services/bean/LoginProviderBean.java | 23 --- .../org/chorem/pollen/services/bean/PollBean.java | 129 ++--------------- .../chorem/pollen/services/bean/PollenBean.java | 4 - .../chorem/pollen/services/bean/PollenBeans.java | 49 +------ .../pollen/services/bean/PollenUserBean.java | 63 +++----- .../chorem/pollen/services/bean/ReportBean.java | 21 --- .../pollen/services/bean/ResourceFileBean.java | 31 ---- .../pollen/services/bean/ResourceMetaBean.java | 26 ---- .../pollen/services/bean/ResourceStreamBean.java | 36 ----- .../pollen/services/bean/UserCredentialBean.java | 21 +-- .../org/chorem/pollen/services/bean/VoteBean.java | 80 ++-------- .../pollen/services/bean/VoteToChoiceBean.java | 24 --- .../chorem/pollen/services/bean/VoterListBean.java | 36 ++--- .../pollen/services/bean/VoterListMemberBean.java | 34 ----- .../bean/export/ChildFavoriteListExport.java | 16 -- .../pollen/services/service/ChoiceService.java | 56 +++++-- .../pollen/services/service/CommentService.java | 45 ++++-- .../services/service/FavoriteListService.java | 73 +++++++--- .../pollen/services/service/FeedbackService.java | 3 +- .../pollen/services/service/FixturesService.java | 14 +- .../chorem/pollen/services/service/GtuService.java | 50 ++++--- .../services/service/NotificationService.java | 9 ++ .../pollen/services/service/PollService.java | 161 +++++++++++++++------ .../services/service/PollenResourceService.java | 35 ++++- .../services/service/PollenServiceSupport.java | 43 +----- .../pollen/services/service/PollenUserService.java | 116 ++++++++------- .../pollen/services/service/ReportService.java | 30 +++- .../pollen/services/service/SocialAuthService.java | 17 ++- .../services/service/VoteCountingService.java | 13 +- .../pollen/services/service/VoteService.java | 104 +++++++++---- .../pollen/services/service/VoterListService.java | 89 +++++++----- .../pollen/services/service/mail/EmailService.java | 8 + .../service/mail/ExceedingMaxVotersEmail.java | 73 ++++++++++ .../email/ExceedingMaxVotersEmail.mustache | 5 + .../email/ExceedingMaxVotersEmail_fr.mustache | 6 + .../i18n/pollen-services_en_GB.properties | 2 + .../i18n/pollen-services_fr_FR.properties | 2 + .../services/service/PollenUserServiceTest.java | 8 +- pollen-ui-riot-js/src/main/web/css/custom.css | 6 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 9 ++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 9 ++ pollen-ui-riot-js/src/main/web/js/Session.js | 3 +- .../src/main/web/js/VoterListService.js | 25 +++- .../src/main/web/tag/admin/UserCard.tag.html | 16 ++ .../src/main/web/tag/admin/UserEditModal.tag.html | 19 +++ .../src/main/web/tag/components/InnerHtml.tag.html | 14 ++ .../main/web/tag/components/date-picker.tag.html | 13 +- .../src/main/web/tag/poll/Poll.tag.html | 34 ++++- .../src/main/web/tag/poll/PollCard.tag.html | 26 +++- .../src/main/web/tag/poll/Votes.tag.html | 29 +++- .../src/main/web/tag/voterList/VoterList.tag.html | 17 ++- 67 files changed, 994 insertions(+), 1005 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.