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 b5565118 compléter le documentation (refs #168) new e1b2e730 modification de la version en 3.0.3 new 578cde0c correction fuite connexion a la base de données pour l'envoie de mails new 0d7838eb Merge branch 'hotfix/3.0.3' new a07b0248 Merge tag '3.0.3' into develop new bce47230 Merge tag '3.0.3' into develop The 5 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 bce472308d211528f018764cf87509deed919d7e Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Nov 7 14:59:24 2017 +0100 Merge tag '3.0.3' into develop correction envoie de mail connexion a la DB # Conflicts: # pollen-persistence/pom.xml # pollen-rest-api/pom.xml # pollen-services/pom.xml # pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java # pollen-ui-riot-js/package.json # pollen-ui-riot-js/pom.xml # pollen-ui-riot-js/src/main/web/i18n/en.json # pollen-ui-riot-js/src/main/web/i18n/fr.json # pollen-votecounting-aggregator/pom.xml # pollen-votecounting-api/pom.xml # pollen-votecounting-borda/pom.xml # pollen-votecounting-condorcet/pom.xml # pollen-votecounting-coombs/pom.xml # pollen-votecounting-cumulative/pom.xml # pollen-votecounting-instant-runoff/pom.xml # pollen-votecounting-normal/pom.xml # pollen-votecounting-number/pom.xml # pom.xml commit a07b02487e14d619299d939fc923773c81ba895f Merge: b5565118 0d7838eb Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Nov 7 14:58:08 2017 +0100 Merge tag '3.0.3' into develop correction envoie de mail connexion a la DB # Conflicts: # pollen-persistence/pom.xml # pollen-rest-api/pom.xml # pollen-services/pom.xml # pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java # pollen-ui-riot-js/package.json # pollen-ui-riot-js/pom.xml # pollen-ui-riot-js/src/main/web/i18n/en.json # pollen-ui-riot-js/src/main/web/i18n/fr.json # pollen-votecounting-aggregator/pom.xml # pollen-votecounting-api/pom.xml # pollen-votecounting-borda/pom.xml # pollen-votecounting-condorcet/pom.xml # pollen-votecounting-coombs/pom.xml # pollen-votecounting-cumulative/pom.xml # pollen-votecounting-instant-runoff/pom.xml # pollen-votecounting-normal/pom.xml # pollen-votecounting-number/pom.xml # pom.xml commit 0d7838eb22f7376b6e17398d168574b7f214aa3a Merge: d49640ee 578cde0c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Nov 7 14:44:36 2017 +0100 Merge branch 'hotfix/3.0.3' commit 578cde0cc568ddc767fb96e814ef3d8708ffeb7e Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Nov 7 14:43:47 2017 +0100 correction fuite connexion a la base de données pour l'envoie de mails commit e1b2e730e87c5103ef8348417f06a976201f6574 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Nov 7 14:26:16 2017 +0100 modification de la version en 3.0.3 Summary of changes: pollen-services/pom.xml | 2 +- .../pollen/services/service/FeedbackService.java | 1 + .../services/service/NotificationService.java | 23 ++++++ .../services/service/PollenServiceSupport.java | 5 ++ .../pollen/services/service/mail/EmailService.java | 87 ++++++++-------------- 5 files changed, 61 insertions(+), 57 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.