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

branch release/1.5.10 deleted (was edf716d)
by chorem.org scm 27 Feb '17

27 Feb '17

This is an automated email from the git hooks/post-receive script. New change to branch release/1.5.10 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git was edf716d [jgitflow-maven-plugin]updating poms for branch'release/1.5.10' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch develop updated (9bc5b8e -> 200032f)
by chorem.org scm 27 Feb '17

27 Feb '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git from 9bc5b8e Update footer new 96dc837 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e04c97c [jgitflow-maven-plugin]updating poms for 1.5.10 branch with snapshot versions new edf716d [jgitflow-maven-plugin]updating poms for branch'release/1.5.10' with non-snapshot versions new 65d6b4c [jgitflow-maven-plugin]merging 'release/1.5.10' into 'master' new 0b1d454 [jgitflow-maven-plugin]merging 'master' into 'develop' new 200032f [jgitflow-maven-plugin]Updating develop poms back to pre merge state 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 200032f86cee51834a4a1af0b80cbd7ae145e8bf Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Feb 27 10:55:09 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 0b1d45449e62a2434897effd0b3199fccd8b8b07 Merge: 96dc837 65d6b4c Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Feb 27 10:55:06 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 96dc8379fb0c13f03c75d09e71d16d5e935d2402 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Feb 27 10:55:05 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 65d6b4cfc6df4cbba9e79b9920440e1209affc8e Merge: 83a375c edf716d Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Feb 27 10:54:53 2017 +0100 [jgitflow-maven-plugin]merging 'release/1.5.10' into 'master' commit edf716da59a14c2459560a39bde6587bec5d5f6c Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Feb 27 10:50:43 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.5.10' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 5

annotated tag pollen-1.5.10 created (now 6ff0b49)
by chorem.org scm 27 Feb '17

27 Feb '17

This is an automated email from the git hooks/post-receive script. New change to annotated tag pollen-1.5.10 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git at 6ff0b49 (tag) tagging 65d6b4cfc6df4cbba9e79b9920440e1209affc8e (commit) replaces pollen-1.5.9 tagged by Maven Release on Mon Feb 27 10:54:56 2017 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 1.5.10 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch release/1.5.10 updated (e04c97c -> edf716d)
by chorem.org scm 27 Feb '17

27 Feb '17

This is an automated email from the git hooks/post-receive script. New change to branch release/1.5.10 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git from e04c97c [jgitflow-maven-plugin]updating poms for 1.5.10 branch with snapshot versions adds edf716d [jgitflow-maven-plugin]updating poms for branch'release/1.5.10' with non-snapshot versions No new revisions were added by this update. Summary of changes: pollen-persistence/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-struts2/pom.xml | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch master updated (83a375c -> 65d6b4c)
by chorem.org scm 27 Feb '17

27 Feb '17

This is an automated email from the git hooks/post-receive script. New change to branch master in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git from 83a375c Merge branch 'release/1.5.9' adds 3c95ae7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ff93dac Merge branch 'master' into develop adds 65c04ac [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds e7c36e6 refs #1147 Implement a sort on poll's comments adds c531270 Add eclipse ignore adds 0ac2660 Update footer adds f0a0847 Center logo on home page. adds 6d26882 Update parent pom adds 49c9fba fixes #1230 Can't add choice date in poll with message 'Date obligatoire', but date is correct adds deec9ce fixes #1385 The poll administration links do not work anymore adds 78341f5 fixes #1300 [Vote] End vote time is not diplayed on vote page adds 3fc0d79 fixes #1301: [Comment] Add anti spam filter vote vote and comments adds 3dee9e3 fixes #1301 [Comment] Add anti spam filter vote vote and comments adds 9bc5b8e Update footer adds e04c97c [jgitflow-maven-plugin]updating poms for 1.5.10 branch with snapshot versions adds edf716d [jgitflow-maven-plugin]updating poms for branch'release/1.5.10' with non-snapshot versions adds 65d6b4c [jgitflow-maven-plugin]merging 'release/1.5.10' into 'master' No new revisions were added by this update. Summary of changes: .gitignore | 9 +++- README.txt => README.md | 0 changelog.txt | 40 ----------------- pollen-persistence/{README.txt => README.md} | 0 pollen-persistence/changelog.txt | 4 -- pollen-persistence/pom.xml | 2 +- .../business/persistence/CommentDAOImpl.java | 19 +++++++- .../pollen/business/persistence/PollImpl.java | 2 +- .../chorem/pollen/business/persistence/Polls.java | 5 +++ .../business/persistence/CommentDAOImplTest.java | 43 ++++++++++++++++++ pollen-services/{README.txt => README.md} | 0 pollen-services/changelog.txt | 4 -- pollen-services/pom.xml | 2 +- .../main/java/org/chorem/pollen/bean/PollUri.java | 5 ++- .../changelog.txt => pollen-ui-struts2/README.md | 0 pollen-ui-struts2/README.txt | 0 pollen-ui-struts2/changelog.txt | 0 pollen-ui-struts2/pom.xml | 2 +- .../pollen/ui/actions/poll/ResultForPoll.java | 4 +- .../ui/actions/poll/vote/AbstractVoteAction.java | 4 +- .../pollen/ui/actions/poll/vote/AddChoice.java | 23 +++++++--- .../pollen/ui/actions/poll/vote/AddComment.java | 17 +++++++ .../i18n/pollen-ui-struts2_en_GB.properties | 1 + .../i18n/pollen-ui-struts2_fr_FR.properties | 1 + .../webapp/WEB-INF/decorators/layout-default.jsp | 13 +++--- .../src/main/webapp/WEB-INF/jsp/home.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/vote.jsp | 5 ++- pollen-ui-struts2/src/main/webapp/css/common.css | 52 +++++++++++----------- .../README.md | 0 pollen-votecounting-aggregator/README.txt | 0 pollen-votecounting-aggregator/changelog.txt | 0 pollen-votecounting-aggregator/pom.xml | 2 +- .../README.md | 0 pollen-votecounting-api/README.txt | 0 pollen-votecounting-api/changelog.txt | 0 pollen-votecounting-api/pom.xml | 2 +- .../README.md | 0 pollen-votecounting-borda/README.txt | 0 pollen-votecounting-borda/changelog.txt | 0 pollen-votecounting-borda/pom.xml | 2 +- .../README.md | 0 pollen-votecounting-condorcet/README.txt | 0 pollen-votecounting-condorcet/changelog.txt | 0 pollen-votecounting-condorcet/pom.xml | 2 +- .../README.md | 0 pollen-votecounting-coombs/pom.xml | 2 +- .../{changelog.txt => README.md} | 0 pollen-votecounting-instant-runoff/pom.xml | 2 +- .../README.md | 0 pollen-votecounting-normal/pom.xml | 2 +- .../README.md | 0 pollen-votecounting-number/pom.xml | 2 +- .../README.md | 0 pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 17 +++---- 55 files changed, 172 insertions(+), 122 deletions(-) rename README.txt => README.md (100%) delete mode 100644 changelog.txt rename pollen-persistence/{README.txt => README.md} (100%) delete mode 100644 pollen-persistence/changelog.txt rename pollen-services/{README.txt => README.md} (100%) delete mode 100644 pollen-services/changelog.txt rename pollen-votecounting-percentage/changelog.txt => pollen-ui-struts2/README.md (100%) delete mode 100644 pollen-ui-struts2/README.txt delete mode 100644 pollen-ui-struts2/changelog.txt rename pollen-votecounting-percentage/README.txt => pollen-votecounting-aggregator/README.md (100%) delete mode 100644 pollen-votecounting-aggregator/README.txt delete mode 100644 pollen-votecounting-aggregator/changelog.txt rename pollen-votecounting-number/changelog.txt => pollen-votecounting-api/README.md (100%) delete mode 100644 pollen-votecounting-api/README.txt delete mode 100644 pollen-votecounting-api/changelog.txt rename pollen-votecounting-number/README.txt => pollen-votecounting-borda/README.md (100%) delete mode 100644 pollen-votecounting-borda/README.txt delete mode 100644 pollen-votecounting-borda/changelog.txt rename pollen-votecounting-normal/changelog.txt => pollen-votecounting-condorcet/README.md (100%) delete mode 100644 pollen-votecounting-condorcet/README.txt delete mode 100644 pollen-votecounting-condorcet/changelog.txt rename pollen-votecounting-normal/README.txt => pollen-votecounting-coombs/README.md (100%) rename pollen-votecounting-instant-runoff/{changelog.txt => README.md} (100%) rename pollen-votecounting-instant-runoff/README.txt => pollen-votecounting-normal/README.md (100%) rename pollen-votecounting-coombs/changelog.txt => pollen-votecounting-number/README.md (100%) rename pollen-votecounting-coombs/README.txt => pollen-votecounting-percentage/README.md (100%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[ANN] - Pollen 1.5.10 released
by chorem.org Release Notification 27 Feb '17

27 Feb '17

The Pollen team is pleased to announce the pollen-1.5.10 release! Application de vote Pollen Documentation of the project can be found here: https://pollen.chorem.org Changes ------- Changes in this version include: New features: o [Comment] Add anti spam filter vote vote and comments Issue: 1301. Thanks to Éric Chatellier. Resolved by echatellier. Fixed Bugs: o The poll administration links do not work anymore Issue: 1385. Thanks to Kevin Morin. Resolved by kmorin. o Fix project url and site urls Issue: 1127. o [Vote] End vote time is not diplayed on vote page Issue: 1300. Thanks to Éric Chatellier. Resolved by kmorin. o Can't add choice date in poll with message 'Date obligatoire', but date is correct Issue: 1230. Thanks to Benjamin Poussin. Resolved by kmorin. Downloads --------- For a manual installation, you can download files here: https://forge.chorem.org/projects/pollen/files * pollen-1.5.10-bin.zip - https://forge.chorem.org/attachments/download/251 * pollen-1.5.10.war - https://forge.chorem.org/attachments/download/252 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Pollen team

1 0

branch release/1.5.10 created (now e04c97c)
by chorem.org scm 27 Feb '17

27 Feb '17

This is an automated email from the git hooks/post-receive script. New change to branch release/1.5.10 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git at e04c97c [jgitflow-maven-plugin]updating poms for 1.5.10 branch with snapshot versions This branch includes the following new commits: new e04c97c [jgitflow-maven-plugin]updating poms for 1.5.10 branch with snapshot versions 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 e04c97c1aaea6a7e2cf8d1fad924bf69cecdd955 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Feb 27 10:43:32 2017 +0100 [jgitflow-maven-plugin]updating poms for 1.5.10 branch with snapshot versions -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (3dee9e3 -> 9bc5b8e)
by chorem.org scm 27 Feb '17

27 Feb '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git from 3dee9e3 fixes #1301 [Comment] Add anti spam filter vote vote and comments new 9bc5b8e Update footer 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 9bc5b8ed9b8b81c8ae6c34dc3bebcf06f98bb206 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Mon Feb 27 10:33:57 2017 +0100 Update footer Summary of changes: .../src/main/webapp/WEB-INF/decorators/layout-default.jsp | 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

branch develop updated (78341f5 -> 3dee9e3)
by chorem.org scm 27 Feb '17

27 Feb '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git from 78341f5 fixes #1300 [Vote] End vote time is not diplayed on vote page new 3fc0d79 fixes #1301: [Comment] Add anti spam filter vote vote and comments new 3dee9e3 fixes #1301 [Comment] Add anti spam filter vote vote and comments 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 3dee9e30f0cc645623859913af6e5b0c02d41f02 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 27 10:33:23 2017 +0100 fixes #1301 [Comment] Add anti spam filter vote vote and comments commit 3fc0d79aab1c9cd988d694e010d48c7a07c3e3ec Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Wed Nov 18 22:22:19 2015 +0100 fixes #1301: [Comment] Add anti spam filter vote vote and comments Summary of changes: .../chorem/pollen/ui/actions/poll/vote/AddComment.java | 17 +++++++++++++++++ .../resources/i18n/pollen-ui-struts2_en_GB.properties | 1 + .../resources/i18n/pollen-ui-struts2_fr_FR.properties | 1 + .../src/main/webapp/WEB-INF/jsp/poll/vote.jsp | 5 ++++- 4 files changed, 23 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch develop updated (dd3b259 -> f1bb76e)
by chorem.org scm 27 Feb '17

27 Feb '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 dd3b259 Update .gitlab-ci.yml new f1bb76e Update .gitlab-ci.yml 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 f1bb76e6c7d28c7c3e26fbdc74dc95ee91ff8a0f Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Feb 27 10:15:26 2017 +0100 Update .gitlab-ci.yml Summary of changes: .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1