- Pollen-commits - mailman.cloud.codelutin.com

branch develop updated (6b8efddf -> 5842a5b1)
by chorem.org scm 21 Jun '17

21 Jun '17

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 6b8efddf fixes #72 Page de confirmation de création de sondage new 5842a5b1 refs #72 modif de la page de résumé (dans un onglet) 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 5842a5b1ca898b96baf2053e5249ac5ab79e0766 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jun 21 11:17:38 2017 +0200 refs #72 modif de la page de résumé (dans un onglet) Summary of changes: pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/src/main/web/conf.js | 2 +- pollen-ui-riot-js/src/main/web/i18n.json | 24 ++--- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 6 +- .../src/main/web/tag/poll/EditPoll.tag.html | 75 +++++++------ .../src/main/web/tag/poll/Poll.tag.html | 64 ----------- .../src/main/web/tag/poll/Summary.tag.html | 120 ++++++--------------- 7 files changed, 96 insertions(+), 197 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (a343353c -> 6b8efddf)
by chorem.org scm 19 Jun '17

19 Jun '17

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 a343353c Affichagez des commentaire dans un panneau latteral dépliable ref #73 adds 881ffdc3 refs #72 creation de la page de résumé adds b261cb45 refs #72 ajout d'autres types de message (pas seulement error) dans le toaster en bas à droite + affichage d'un message de succès de création et d'enregistrement + redirection vers le résumé plutôt que vers la page de vote adds 49bc888d fix bad merge new 6b8efddf fixes #72 Page de confirmation de création de sondage 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 6b8efddf01060d4a0783d69097ed6578b3eaf42e Merge: a343353c 49bc888d Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jun 19 17:30:18 2017 +0200 fixes #72 Page de confirmation de création de sondage Summary of changes: pollen-ui-riot-js/src/main/web/conf.js | 2 +- pollen-ui-riot-js/src/main/web/i18n.json | 36 +++++ .../src/main/web/js/{Error.js => Message.js} | 18 ++- pollen-ui-riot-js/src/main/web/js/Poll.js | 9 +- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 10 +- .../src/main/web/tag/PollenErrorManager.tag.html | 66 --------- .../src/main/web/tag/PollenMessageManager.tag.html | 66 +++++++++ .../web/tag/favoriteList/FavoriteList.tag.html | 12 +- .../web/tag/favoriteList/FavoriteLists.tag.html | 2 +- .../src/main/web/tag/poll/ChoiceView.tag.html | 11 +- .../src/main/web/tag/poll/Description.tag.html | 15 +- .../src/main/web/tag/poll/EditPoll.tag.html | 9 +- .../src/main/web/tag/poll/Podium.tag.html | 6 +- .../src/main/web/tag/poll/Poll.tag.html | 4 +- .../src/main/web/tag/poll/Results.tag.html | 2 +- .../src/main/web/tag/poll/Summary.tag.html | 159 +++++++++++++++++++++ .../src/main/web/tag/poll/Votes.tag.html | 4 +- .../src/main/web/tag/popup/QrCodeButton.tag.html | 1 + .../web/tag/voterList/VoterListActions.tag.html | 2 +- 19 files changed, 332 insertions(+), 102 deletions(-) rename pollen-ui-riot-js/src/main/web/js/{Error.js => Message.js} (76%) delete mode 100644 pollen-ui-riot-js/src/main/web/tag/PollenErrorManager.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/PollenMessageManager.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/72_poll_creation_confirmation created (now 49bc888d)
by chorem.org scm 19 Jun '17

19 Jun '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/72_poll_creation_confirmation in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 49bc888d fix bad merge This branch includes the following new commits: new 881ffdc3 refs #72 creation de la page de résumé new b261cb45 refs #72 ajout d'autres types de message (pas seulement error) dans le toaster en bas à droite + affichage d'un message de succès de création et d'enregistrement + redirection vers le résumé plutôt que vers la page de vote new 49bc888d fix bad merge The 3 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 49bc888da9c0a1ec5ba2152e7d9113d41da59086 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jun 19 17:29:29 2017 +0200 fix bad merge commit 881ffdc3d9a3f6038b2fd618c13647cd9df19cdd Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jun 19 16:34:27 2017 +0200 refs #72 creation de la page de résumé commit b261cb45466c092c2efe363a731d6d80bb2520ed Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jun 19 17:14:05 2017 +0200 refs #72 ajout d'autres types de message (pas seulement error) dans le toaster en bas à droite + affichage d'un message de succès de création et d'enregistrement + redirection vers le résumé plutôt que vers la page de vote -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch develop updated (cbd67201 -> a343353c)
by chorem.org scm 19 Jun '17

19 Jun '17

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 cbd67201 Re-charger le sondage en cas de reconnexion. new a343353c Affichagez des commentaire dans un panneau latteral dépliable ref #73 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 a343353c7da282730985cc06dc80daab39ab3610 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Jun 19 11:04:22 2017 +0200 Affichagez des commentaire dans un panneau latteral dépliable ref #73 Summary of changes: pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/src/main/web/conf.js | 2 +- pollen-ui-riot-js/src/main/web/css/custom.css | 4 +- pollen-ui-riot-js/src/main/web/i18n.json | 6 +- .../main/web/tag/components/LetterAvatar.tag.html | 42 ++ .../src/main/web/tag/poll/Comments.tag.html | 432 ++++++++++++--------- .../src/main/web/tag/poll/Poll.tag.html | 7 +- 7 files changed, 308 insertions(+), 187 deletions(-) create mode 100644 pollen-ui-riot-js/src/main/web/tag/components/LetterAvatar.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (d193ac8f -> cbd67201)
by chorem.org scm 15 Jun '17

15 Jun '17

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 d193ac8f Signalement de contenu inapproprié (ref #63) new cbd67201 Re-charger le sondage en cas de reconnexion. 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 cbd67201a16d53647b6ba0e3e1a4254076547efb Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Jun 15 14:41:55 2017 +0200 Re-charger le sondage en cas de reconnexion. Summary of changes: .../org/chorem/pollen/services/service/CommentService.java | 4 ++++ .../org/chorem/pollen/services/service/VoteService.java | 5 +++++ pollen-ui-riot-js/src/main/web/js/Poll.js | 13 ++++++++----- pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html | 4 ++++ pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html | 5 +++++ pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html | 5 +++++ pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 11 ++++++++--- 7 files changed, 39 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (8ef242d5 -> d193ac8f)
by chorem.org scm 15 Jun '17

15 Jun '17

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(a)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(a)chorem.org>.

1 1

branch develop updated (f62212de -> 8ef242d5)
by chorem.org scm 13 Jun '17

13 Jun '17

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 f62212de refs #57 conf par défaut à vide pour piwik + suprpession dependance inutile new 8ef242d5 remove unused dependency 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 8ef242d51917978a8004322a8eb99066ed330e0f Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jun 13 15:21:45 2017 +0200 remove unused dependency Summary of changes: pollen-ui-riot-js/src/main/web/conf.js | 2 +- pollen-ui-riot-js/src/main/web/js/PageTracker.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (62263a06 -> f62212de)
by chorem.org scm 13 Jun '17

13 Jun '17

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 62263a06 fixes #57 analyse du trafic new f62212de refs #57 conf par défaut à vide pour piwik + suprpession dependance inutile 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 f62212de9d08b76198da2872a6b2e7e99bcd3a78 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jun 13 15:10:53 2017 +0200 refs #57 conf par défaut à vide pour piwik + suprpession dependance inutile Summary of changes: pollen-ui-riot-js/package.json | 1 - pollen-ui-riot-js/src/main/web/conf.js | 4 ++-- pollen-ui-riot-js/src/main/web/js/PageTracker.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (43a6ddc3 -> 62263a06)
by chorem.org scm 13 Jun '17

13 Jun '17

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 43a6ddc3 fixes #71 ajout du cron pour renvoyer les emails en erreur new 62263a06 fixes #57 analyse du trafic 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 62263a06e59e70891b4cf72b325dbdd1f653d419 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jun 13 15:01:25 2017 +0200 fixes #57 analyse du trafic Summary of changes: pollen-ui-riot-js/package.json | 3 +- pollen-ui-riot-js/src/main/web/conf.js | 2 + pollen-ui-riot-js/src/main/web/js/PageTracker.js | 65 ++++++++++++++++++++++++ pollen-ui-riot-js/src/main/web/js/Poll.js | 13 +++++ pollen-ui-riot-js/src/main/web/js/PollForm.js | 9 +++- pollen-ui-riot-js/src/main/web/js/Session.js | 2 + 6 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 pollen-ui-riot-js/src/main/web/js/PageTracker.js -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (d339bb58 -> 43a6ddc3)
by chorem.org scm 08 Jun '17

08 Jun '17

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 d339bb58 Import et Export des listes de votants (refs #62) adds 3efebb6a refs #71 creation de la table pour stocker les emails en erreur adds 7877fa28 refs #71 envoi des emails dans un thread séparé + ajout de methode pour renvoyer les mails en erreur adds 43a6ddc3 fixes #71 ajout du cron pour renvoyer les emails en erreur No new revisions were added by this update. Summary of changes: .../migration/h2/V3_0_0_2__add_email_to_resend.sql | 10 ++ .../postgresql/V3_0_0_2__add_email_to_resend.sql | 10 ++ pollen-persistence/src/main/xmi/pollen.properties | 5 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 24351 -> 25580 bytes .../rest/api/PollenRestApiApplicationListener.java | 18 ++- pollen-services/src/main/config/PollenServices.ini | 8 +- .../pollen/services/job/SendEmailInErrorsJob.java | 39 +++++++ .../services/job/SendPollEndReminderJob.java | 13 +-- .../pollen/services/service/mail/EmailService.java | 130 +++++++++++++++------ .../i18n/pollen-services_en_GB.properties | 4 +- .../i18n/pollen-services_fr_FR.properties | 2 +- 11 files changed, 183 insertions(+), 56 deletions(-) create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_2__add_email_to_resend.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_2__add_email_to_resend.sql create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/job/SendEmailInErrorsJob.java -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0