This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit cdf1f79a9cb39089027d372001f4ac580b5d0f65 Merge: 05c1948 47a8f2d Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 14:36:00 2014 +0200 Merge branch 'feature/Notification' into develop pollen-rest-api/src/main/resources/mapping | 2 +- .../src/main/resources/pollen-rest-api.properties | 6 ++ .../services/config/PollenServiceConfig.java | 27 ++++++++ .../services/config/PollenServiceConfigOption.java | 28 +++++++- .../services/service/NotificationService.java | 34 +++++----- .../services/service/PollenServiceSupport.java | 4 ++ .../services/service/PollenUIUrlRenderService.java | 77 +++++++++++++++++++++ .../pollen/services/service/PollenUserService.java | 47 ++++++++++--- .../services/service/mail/ChoiceAddedEmail.java | 2 +- .../services/service/mail/ChoiceDeletedEmail.java | 2 +- .../services/service/mail/ChoiceEditedEmail.java | 2 +- .../services/service/mail/CommentAddedEmail.java | 2 +- .../services/service/mail/CommentDeletedEmail.java | 2 +- .../services/service/mail/CommentEditedEmail.java | 2 +- .../pollen/services/service/mail/EmailService.java | 24 ++++++- .../services/service/mail/LostPasswordEmail.java | 17 ++++- .../service/mail/PollChoicePeriodEndedEmail.java | 2 +- .../service/mail/PollChoicePeriodStartedEmail.java | 2 +- .../services/service/mail/PollClosedEmail.java | 2 +- .../services/service/mail/PollCreatedEmail.java | 22 +++++- .../service/mail/PollVotePeriodEndedEmail.java | 2 +- .../service/mail/PollVotePeriodStartedEmail.java | 2 +- .../service/mail/PollVoteReminderEmail.java | 2 +- .../mail/RestrictedPollInvitationEmail.java | 2 +- .../service/mail/UserAccountCreatedEmail.java | 33 ++++++++- .../services/service/mail/VoteAddedEmail.java | 2 +- .../services/service/mail/VoteDeletedEmail.java | 2 +- .../services/service/mail/VoteEditedEmail.java | 2 +- .../resources/email/LostPasswordEmail.mustache | 8 +++ .../resources/email/LostPasswordEmail_fr.mustache | 8 +++ ...wordEmail.mustache => PollClosedEmail.mustache} | 0 ...dEmail.mustache => PollClosedEmail_fr.mustache} | 0 .../main/resources/email/PollCreatedEmail.mustache | 15 ++++ .../resources/email/PollCreatedEmail_fr.mustache | 15 ++++ .../email/UserAccountCreatedEmail.mustache | 10 +++ .../email/UserAccountCreatedEmail_fr.mustache | 10 +++ .../service/PollenUIUrlRenderServiceTest.java | 79 ++++++++++++++++++++++ .../src/test/resources/pollen-services.properties | 5 ++ pollen-ui-angular/src/main/webapp/i18n/en.js | 2 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 + pollen-ui-angular/src/main/webapp/index.html | 2 + pollen-ui-angular/src/main/webapp/js/app.js | 2 +- .../src/main/webapp/js/controllers/userCtrl.js | 12 ++++ pollen-ui-angular/src/main/webapp/js/services.js | 4 ++ .../src/main/webapp/partials/inline-poll.html | 2 - .../src/main/webapp/partials/user-login.html | 2 +- 46 files changed, 476 insertions(+), 55 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.