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@chorem.org>.