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 3cc449cd correction des permission en cas d'ajout de vote ou de commentaire pour des sondage restreint + correction style pour les choix new 84d92fd3 refs #14 création du flux atom à la création du sondage + ajout des entrées dans le flux pour l'ajout, la suppression et la modification d'un vote + ajout du bouton pour lire le flux à partir du sondage new 023a6f7b refs #14 add feed content in poll + migration new 9ac68cf4 refs #14 add permission to feed url new 6533396c modification des emails (pas d'affichage du contenu du vote) new a48ef556 refs #14 do not display user name if the vote is anonymous new 8362eed3 refs #14 fix tests new b1bbd56f fixes #14 add the missing events in the feed The 7 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 b1bbd56f8c8bf2ad336311d985d802c6d5cdb865 Author: Kevin Morin <morin@codelutin.com> Date: Fri Jun 2 17:39:57 2017 +0200 fixes #14 add the missing events in the feed commit 8362eed38ece5cacc4e980227c650dcd11fc99dc Author: Kevin Morin <morin@codelutin.com> Date: Fri Jun 2 10:09:31 2017 +0200 refs #14 fix tests commit a48ef55638b40fee8c7eb59567f187a04546da3e Author: Kevin Morin <morin@codelutin.com> Date: Fri Jun 2 10:09:03 2017 +0200 refs #14 do not display user name if the vote is anonymous commit 6533396ca12a22822751e06053d0809bb0a4352b Author: Kevin Morin <morin@codelutin.com> Date: Fri Jun 2 10:08:06 2017 +0200 modification des emails (pas d'affichage du contenu du vote) commit 9ac68cf471e58834bdf2963473186360a311a811 Author: Kevin Morin <morin@codelutin.com> Date: Fri Jun 2 10:06:10 2017 +0200 refs #14 add permission to feed url commit 023a6f7ba765615c3c5466ed1f0630065cf85b3f Author: Kevin Morin <morin@codelutin.com> Date: Fri Jun 2 10:03:43 2017 +0200 refs #14 add feed content in poll + migration commit 84d92fd3eec9fd5eb04f338f2704b012c1bf732f Author: Kevin Morin <morin@codelutin.com> Date: Fri May 12 09:26:40 2017 +0200 refs #14 création du flux atom à la création du sondage + ajout des entrées dans le flux pour l'ajout, la suppression et la modification d'un vote + ajout du bouton pour lire le flux à partir du sondage Summary of changes: .../db/migration/common/V3_0_0_1__exemple.sql | 2 - .../h2/V3_0_0_1__add_feed_content_in_poll.sql | 2 + .../db/migration/h2/V3_0_0_2__exemple.sql | 2 - .../V3_0_0_1__add_feed_content_in_poll.sql | 2 + .../db/migration/postgresql/V3_0_0_2__exemple.sql | 3 - pollen-persistence/src/main/xmi/pollen.properties | 3 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 24262 -> 24351 bytes .../org/chorem/pollen/rest/api/v1/PollApi.java | 6 + pollen-rest-api/src/main/resources/mapping | 2 + .../pollen/rest/api/AbstractPollenRestApiTest.java | 3 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 10 +- pollen-services/pom.xml | 6 +- .../pollen/services/service/ChoiceService.java | 1 + .../pollen/services/service/CommentService.java | 3 + .../pollen/services/service/FeedService.java | 158 +++++++++++++++++++++ .../services/service/NotificationService.java | 2 +- .../pollen/services/service/PollService.java | 4 + .../services/service/PollenServiceSupport.java | 28 ++++ .../pollen/services/service/VoteService.java | 3 + .../services/service/mail/AbstractVoteEmail.java | 36 ++--- .../pollen/services/service/mail/EmailService.java | 62 ++------ .../services/service/mail/VoteAddedEmail.java | 15 +- .../services/service/mail/VoteDeletedEmail.java | 15 +- .../services/service/mail/VoteEditedEmail.java | 15 +- .../main/resources/email/VoteAddedEmail.mustache | 12 +- .../resources/email/VoteAddedEmail_fr.mustache | 12 +- .../main/resources/email/VoteDeletedEmail.mustache | 12 +- .../resources/email/VoteDeletedEmail_fr.mustache | 12 +- .../main/resources/email/VoteEditedEmail.mustache | 12 +- .../resources/email/VoteEditedEmail_fr.mustache | 10 -- .../main/resources/email/VoteSummaryEmail.mustache | 26 ---- .../resources/email/VoteSummaryEmail_fr.mustache | 26 ---- .../i18n/pollen-services_en_GB.properties | 13 ++ .../i18n/pollen-services_fr_FR.properties | 14 +- pollen-ui-riot-js/src/main/web/conf.js | 2 +- .../src/main/web/tag/poll/Poll.tag.html | 3 +- pom.xml | 8 +- 37 files changed, 284 insertions(+), 261 deletions(-) delete mode 100644 pollen-persistence/src/main/resources/db/migration/common/V3_0_0_1__exemple.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_1__add_feed_content_in_poll.sql delete mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_2__exemple.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_1__add_feed_content_in_poll.sql delete mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_2__exemple.sql create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/FeedService.java delete mode 100644 pollen-services/src/main/resources/email/VoteSummaryEmail.mustache delete mode 100644 pollen-services/src/main/resources/email/VoteSummaryEmail_fr.mustache -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.