[Pollen-commits] branch develop updated (b1bbd56f -> 2fd99578)

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 b1bbd56f fixes #14 add the missing events in the feed new 7247a902 ajout d'une signature commune à tous les mails new 2cdc8ec5 Suppression des balises html dans les emails new ce4e2f05 Signature basée sur les données du context d'ui, pas du mail new 2fd99578 Ajout des mails manquants The 4 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 2fd99578531d2c93a17d01c4d1672a8cac283c58 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jun 6 17:15:23 2017 +0200 Ajout des mails manquants commit ce4e2f058a3b706d09ee3dfb45590aac33dddf21 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jun 6 15:29:07 2017 +0200 Signature basée sur les données du context d'ui, pas du mail commit 2cdc8ec559ab509aca4cb585f05d635001447734 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jun 6 10:58:38 2017 +0200 Suppression des balises html dans les emails commit 7247a902d3515075b5648b5bfefce4380fe85309 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jun 6 10:58:14 2017 +0200 ajout d'une signature commune à tous les mails Summary of changes: .../services/service/NotificationService.java | 82 ++++++++++++++-------- .../pollen/services/service/PollenUserService.java | 2 +- .../pollen/services/service/mail/EmailService.java | 39 +++++++++- .../pollen/services/service/mail/PollenMail.java | 9 +++ ...wordEmail.java => UserAccountDeletedEmail.java} | 44 +++--------- ...eatedEmail.java => UserAccountEditedEmail.java} | 23 ++---- ...il.java => UserAccountEmailValidatedEmail.java} | 14 ++-- ...l.java => UserAccountPasswordChangedEmail.java} | 14 ++-- .../main/resources/email/ChoiceAddedEmail.mustache | 3 + .../resources/email/ChoiceAddedEmail_fr.mustache | 3 + .../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/LostPasswordEmail.mustache | 2 +- .../resources/email/LostPasswordEmail_fr.mustache | 2 +- ...ache => PollChoicePeriodEndedEmail_fr.mustache} | 0 .../main/resources/email/PollCreatedEmail.mustache | 4 +- .../resources/email/PollCreatedEmail_fr.mustache | 4 +- .../resources/email/PollEndReminderEmail.mustache | 4 +- .../email/PollEndReminderEmail_fr.mustache | 4 +- .../resources/email/PollInvitationEmail.mustache | 2 +- .../email/PollInvitationEmail_fr.mustache | 2 +- .../resources/email/ResendValidationEmail.mustache | 5 +- .../email/ResendValidationEmail_fr.mustache | 4 +- .../email/RestrictedPollInvitationEmail.mustache | 2 +- .../RestrictedPollInvitationEmail_fr.mustache | 2 +- .../email/UserAccountCreatedEmail.mustache | 6 +- .../email/UserAccountCreatedEmail_fr.mustache | 4 +- .../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 + .../src/main/resources/email/signing.mustache | 6 ++ .../src/main/resources/email/signing_fr.mustache | 6 ++ .../i18n/pollen-services_en_GB.properties | 4 ++ .../i18n/pollen-services_fr_FR.properties | 6 +- 43 files changed, 226 insertions(+), 124 deletions(-) copy pollen-services/src/main/java/org/chorem/pollen/services/service/mail/{LostPasswordEmail.java => UserAccountDeletedEmail.java} (63%) copy pollen-services/src/main/java/org/chorem/pollen/services/service/mail/{UserAccountCreatedEmail.java => UserAccountEditedEmail.java} (75%) copy pollen-services/src/main/java/org/chorem/pollen/services/service/mail/{UserAccountCreatedEmail.java => UserAccountEmailValidatedEmail.java} (84%) copy pollen-services/src/main/java/org/chorem/pollen/services/service/mail/{UserAccountCreatedEmail.java => UserAccountPasswordChangedEmail.java} (84%) create mode 100644 pollen-services/src/main/resources/email/ChoiceAddedEmail.mustache create mode 100644 pollen-services/src/main/resources/email/ChoiceAddedEmail_fr.mustache create mode 100644 pollen-services/src/main/resources/email/CommentAddedEmail.mustache create mode 100644 pollen-services/src/main/resources/email/CommentAddedEmail_fr.mustache create mode 100644 pollen-services/src/main/resources/email/CommentDeletedEmail.mustache create mode 100644 pollen-services/src/main/resources/email/CommentDeletedEmail_fr.mustache create mode 100644 pollen-services/src/main/resources/email/CommentEditedEmail.mustache create mode 100644 pollen-services/src/main/resources/email/CommentEditedEmail_fr.mustache rename pollen-services/src/main/resources/email/{PollChoicePeriodEndedEmail_en.mustache => PollChoicePeriodEndedEmail_fr.mustache} (100%) create mode 100644 pollen-services/src/main/resources/email/UserAccountDeletedEmail.mustache create mode 100644 pollen-services/src/main/resources/email/UserAccountDeletedEmail_fr.mustache create mode 100644 pollen-services/src/main/resources/email/UserAccountEditedEmail.mustache create mode 100644 pollen-services/src/main/resources/email/UserAccountEditedEmail_fr.mustache create mode 100644 pollen-services/src/main/resources/email/UserAccountEmailValidatedEmail.mustache create mode 100644 pollen-services/src/main/resources/email/UserAccountEmailValidatedEmail_fr.mustache create mode 100644 pollen-services/src/main/resources/email/UserAccountPasswordChangedEmail.mustache create mode 100644 pollen-services/src/main/resources/email/UserAccountPasswordChangedEmail_fr.mustache create mode 100644 pollen-services/src/main/resources/email/signing.mustache create mode 100644 pollen-services/src/main/resources/email/signing_fr.mustache -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.