[Pollen-commits] branch develop updated (8ef242d5 -> d193ac8f)

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 8ef242d5 remove unused dependency new d193ac8f Signalement de contenu inapproprié (ref #63) 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 d193ac8ff671230742299a4d8cc6210d5b3df773 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Jun 15 13:28:31 2017 +0200 Signalement de contenu inapproprié (ref #63) Summary of changes: .../pollen/persistence/entity/ReportResume.java | 43 + .../pollen/persistence/entity/ReportTopiaDao.java | 26 + .../db/migration/h2/V3_0_0_3__add_reports.sql | 11 + .../migration/postgresql/V3_0_0_3__add_reports.sql | 11 + pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 25580 -> 26098 bytes .../rest/api/PollenRestApiApplicationListener.java | 4 +- .../org/chorem/pollen/rest/api/v1/ChoiceApi.java | 20 + .../org/chorem/pollen/rest/api/v1/CommentApi.java | 22 + .../org/chorem/pollen/rest/api/v1/PollApi.java | 20 + pollen-rest-api/src/main/resources/mapping | 64 +- pollen-services/src/main/config/PollenServices.ini | 8 +- .../chorem/pollen/services/PollenUIContext.java | 9 + .../chorem/pollen/services/bean/ChoiceBean.java | 10 + .../chorem/pollen/services/bean/CommentBean.java | 10 + .../org/chorem/pollen/services/bean/PollBean.java | 10 + .../chorem/pollen/services/bean/ReportBean.java | 65 ++ .../chorem/pollen/services/bean/ReportLevel.java | 30 + .../pollen/services/bean/ReportResumeBean.java | 53 + .../org/chorem/pollen/services/bean/VoteBean.java | 10 + .../pollen/services/service/ChoiceService.java | 4 + .../pollen/services/service/CommentService.java | 4 + .../service/FavoriteListImportFromLdap.java | 3 +- .../services/service/NotificationService.java | 89 ++ .../pollen/services/service/PollService.java | 4 + .../services/service/PollenServiceSupport.java | 9 + .../services/service/PollenUIUrlRenderService.java | 11 + .../pollen/services/service/ReportService.java | 191 ++++ .../pollen/services/service/VoteService.java | 4 + .../services/service/mail/AbstractReportEmail.java | 70 ++ .../service/mail/AbstractReportForAdminEmail.java | 49 + .../services/service/mail/ChoiceReportEmail.java | 35 + .../service/mail/ChoiceReportForAdminEmail.java | 35 + .../services/service/mail/CommentReportEmail.java | 26 + .../service/mail/CommentReportForAdminEmail.java | 26 + .../pollen/services/service/mail/EmailService.java | 145 +++ .../services/service/mail/PollReportEmail.java | 22 + .../service/mail/PollReportForAdminEmail.java | 22 + .../pollen/services/service/mail/PollenMail.java | 16 +- .../resources/email/ChoiceReportEmail.mustache | 8 + .../resources/email/ChoiceReportEmail_fr.mustache | 8 + .../email/ChoiceReportForAdminEmail.mustache | 14 + .../email/ChoiceReportForAdminEmail_fr.mustache | 14 + .../resources/email/CommentReportEmail.mustache | 8 + .../resources/email/CommentReportEmail_fr.mustache | 8 + .../email/CommentReportForAdminEmail.mustache | 14 + .../email/CommentReportForAdminEmail_fr.mustache | 14 + .../main/resources/email/PollReportEmail.mustache | 8 + .../resources/email/PollReportEmail_fr.mustache | 8 + .../email/PollReportForAdminEmail.mustache | 14 + .../email/PollReportForAdminEmail_fr.mustache | 14 + .../i18n/pollen-services_en_GB.properties | 10 + .../i18n/pollen-services_fr_FR.properties | 10 + .../src/main/web/css/{main.css => blaze.css} | 561 ++++----- pollen-ui-riot-js/src/main/web/css/main.css | 1193 +------------------- pollen-ui-riot-js/src/main/web/i18n.json | 38 +- pollen-ui-riot-js/src/main/web/index.html | 1 + pollen-ui-riot-js/src/main/web/js/ChoiceService.js | 24 + .../src/main/web/js/CommentService.js | 24 + pollen-ui-riot-js/src/main/web/js/Poll.js | 48 + pollen-ui-riot-js/src/main/web/js/PollService.js | 24 + pollen-ui-riot-js/src/main/web/js/Session.js | 3 +- .../src/main/web/tag/poll/ChoiceView.tag.html | 7 + .../src/main/web/tag/poll/Comments.tag.html | 3 +- .../src/main/web/tag/poll/Poll.tag.html | 3 +- .../src/main/web/tag/poll/Report.tag.html | 232 ++++ .../src/main/web/tag/popup/Modal.tag.html | 3 +- .../src/main/web/tag/popup/NewPassword.tag.html | 4 +- .../main/web/tag/popup/ResendValidation.tag.html | 2 +- .../web/tag/voterList/VoterListActions.tag.html | 2 +- 70 files changed, 1965 insertions(+), 1552 deletions(-) create mode 100644 pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/ReportResume.java create mode 100644 pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/ReportTopiaDao.java create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_3__add_reports.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_3__add_reports.sql create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/ReportBean.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/ReportLevel.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/ReportResumeBean.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/ReportService.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/mail/AbstractReportEmail.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/mail/AbstractReportForAdminEmail.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceReportEmail.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceReportForAdminEmail.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentReportEmail.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentReportForAdminEmail.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollReportEmail.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollReportForAdminEmail.java create mode 100644 pollen-services/src/main/resources/email/ChoiceReportEmail.mustache create mode 100644 pollen-services/src/main/resources/email/ChoiceReportEmail_fr.mustache create mode 100644 pollen-services/src/main/resources/email/ChoiceReportForAdminEmail.mustache create mode 100644 pollen-services/src/main/resources/email/ChoiceReportForAdminEmail_fr.mustache create mode 100644 pollen-services/src/main/resources/email/CommentReportEmail.mustache create mode 100644 pollen-services/src/main/resources/email/CommentReportEmail_fr.mustache create mode 100644 pollen-services/src/main/resources/email/CommentReportForAdminEmail.mustache create mode 100644 pollen-services/src/main/resources/email/CommentReportForAdminEmail_fr.mustache create mode 100644 pollen-services/src/main/resources/email/PollReportEmail.mustache create mode 100644 pollen-services/src/main/resources/email/PollReportEmail_fr.mustache create mode 100644 pollen-services/src/main/resources/email/PollReportForAdminEmail.mustache create mode 100644 pollen-services/src/main/resources/email/PollReportForAdminEmail_fr.mustache copy pollen-ui-riot-js/src/main/web/css/{main.css => blaze.css} (80%) create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Report.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.