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

[pollen] branch develop updated (4e0a907 -> bcefcc2)
by chorem.org scm Aug. 26, 2014

Aug. 26, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 4e0a907 fixes #1059 check poll.maxChoiceNumber before submit poll new bcefcc2 ref #1061 use globalVariables.editMode to hide pencil in the vote page 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 bcefcc2acca3257f687a4be9030822fbd3998155 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 26 16:47:49 2014 +0200 ref #1061 use globalVariables.editMode to hide pencil in the vote page Summary of changes: pollen-ui-angular/src/main/webapp/partials/poll-poll.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch develop updated (64880d1 -> 4e0a907)
by chorem.org scm Aug. 26, 2014

Aug. 26, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 64880d1 add translate new 4e0a907 fixes #1059 check poll.maxChoiceNumber before submit poll 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 4e0a9079679dfd1d82bd0be0db73bf454a5322f5 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 26 16:15:02 2014 +0200 fixes #1059 check poll.maxChoiceNumber before submit poll Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + .../src/main/webapp/js/controllers/pollCtrl.js | 21 +++++++++++++++++++-- .../src/main/webapp/partials/poll-settings.html | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch develop updated (cfc2bbe -> 64880d1)
by chorem.org scm Aug. 26, 2014

Aug. 26, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git discards cfc2bbe add translate new 64880d1 add translate This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cfc2bbe) \ N -- N -- N refs/heads/develop (64880d1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. 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 64880d1a8066c9395e63fe04d53741c18b85864b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 26 15:37:10 2014 +0200 add translate Summary of changes: pollen-ui-angular/src/main/webapp/i18n/fr.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch develop updated (f5cfaaa -> cfc2bbe)
by chorem.org scm Aug. 26, 2014

Aug. 26, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from f5cfaaa fixes #1066 remove convert jqplot chart and jqplot pie to image new cfc2bbe add translate 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 cfc2bbef6cb0ee6e1766bed92ae86cf6c9914218 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 26 15:37:10 2014 +0200 add translate Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch develop updated (1154afc -> f5cfaaa)
by chorem.org scm Aug. 26, 2014

Aug. 26, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 1154afc fixes sticky if not found #poll-inline new f5cfaaa fixes #1066 remove convert jqplot chart and jqplot pie to image 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 f5cfaaadedc72a2e254aab1ecc97516aebf6f29c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 26 15:27:50 2014 +0200 fixes #1066 remove convert jqplot chart and jqplot pie to image Summary of changes: pollen-ui-angular/src/main/webapp/index.html | 1 - pollen-ui-angular/src/main/webapp/js/directives.js | 12 +++++------- 2 files changed, 5 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch develop updated (7f2a165 -> 1154afc)
by chorem.org scm Aug. 26, 2014

Aug. 26, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 7f2a165 Add INSTALL.txt, and update README.txt new 1154afc fixes sticky if not found #poll-inline 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 1154afc7dc265d6e77d36394260704fce8e5f6be Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 26 15:02:24 2014 +0200 fixes sticky if not found #poll-inline Summary of changes: .../src/main/webapp/js/scripts/sticky-inline-poll.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch develop updated (05c1948 -> 7f2a165)
by chorem.org scm Aug. 26, 2014

Aug. 26, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 05c1948 fix directory Mustache template adds 3ca0e13 add UI URL render adds ca68e84 add template email for new Account, new Poll, lost password adds fa6d20f UI can validate email adds e4fb282 improve template adds 10e74d5 no send notify when close poll adds 1ee42f4 move include sticky-inline-poll.js for use optimized cache adds 47a8f2d auto validate default users new cdf1f79 Merge branch 'feature/Notification' into develop new 7f2a165 Add INSTALL.txt, and update README.txt The 2 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 7f2a165aef57320b003b544f4fb488f9f103e8bf Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 26 14:45:36 2014 +0200 Add INSTALL.txt, and update README.txt commit cdf1f79a9cb39089027d372001f4ac580b5d0f65 Merge: 05c1948 47a8f2d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 26 14:36:00 2014 +0200 Merge branch 'feature/Notification' into develop Summary of changes: .../README.txt => pollen-rest-api/INSTALL.txt | 15 +--- 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 +++ .../main/resources/email/PollClosedEmail.mustache | 0 .../resources/email/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/INSTALL.txt | 17 +++++ pollen-ui-angular/README.txt | 46 +------------ 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 +- 49 files changed, 497 insertions(+), 112 deletions(-) copy pollen-ui-angular/README.txt => pollen-rest-api/INSTALL.txt (82%) create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUIUrlRenderService.java copy pollen-rest-api/changelog.txt => pollen-services/src/main/resources/email/PollClosedEmail.mustache (100%) copy pollen-rest-api/changelog.txt => pollen-services/src/main/resources/email/PollClosedEmail_fr.mustache (100%) create mode 100644 pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUIUrlRenderServiceTest.java create mode 100644 pollen-ui-angular/INSTALL.txt -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

[pollen] branch feature/Notification updated (10e74d5 -> 47a8f2d)
by chorem.org scm Aug. 26, 2014

Aug. 26, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/Notification in repository pollen. See http://git.chorem.org/pollen.git from 10e74d5 no send notify when close poll new 1ee42f4 move include sticky-inline-poll.js for use optimized cache new 47a8f2d auto validate default users The 2 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 47a8f2d90d3f9873a95b58e7a23b09261d1cf155 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 26 14:29:59 2014 +0200 auto validate default users commit 1ee42f4af6ae0e1993b9a6920e602d1c41e94869 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 26 12:18:27 2014 +0200 move include sticky-inline-poll.js for use optimized cache Summary of changes: .../pollen/services/service/PollenUserService.java | 45 +++++++++++++++++----- pollen-ui-angular/src/main/webapp/index.html | 2 + .../src/main/webapp/partials/inline-poll.html | 2 - 3 files changed, 37 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

[pollen] branch feature/Notification updated (e4fb282 -> 10e74d5)
by chorem.org scm Aug. 26, 2014

Aug. 26, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/Notification in repository pollen. See http://git.chorem.org/pollen.git from e4fb282 improve template new 10e74d5 no send notify when close poll 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 10e74d598757fe9e776c51af6eddbf48072ea615 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 26 11:42:48 2014 +0200 no send notify when close poll Summary of changes: .../java/org/chorem/pollen/services/service/NotificationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/Notification updated (fa6d20f -> e4fb282)
by chorem.org scm Aug. 26, 2014

Aug. 26, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/Notification in repository pollen. See http://git.chorem.org/pollen.git from fa6d20f UI can validate email new e4fb282 improve template 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 e4fb2823285b1b52c824b9b9de16258b077d864d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 26 11:01:19 2014 +0200 improve template Summary of changes: .../pollen/services/service/mail/EmailService.java | 6 +++++- .../services/service/mail/PollCreatedEmail.java | 9 +++++++++ .../service/mail/UserAccountCreatedEmail.java | 19 ++++++++++++++----- .../main/resources/email/PollCreatedEmail.mustache | 9 +++++++++ .../main/resources/email/PollCreatedEmail_fr.mustache | 10 ++++++++++ .../resources/email/UserAccountCreatedEmail.mustache | 4 +++- .../email/UserAccountCreatedEmail_fr.mustache | 4 +++- 7 files changed, 53 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1