This is an automated email from the git hooks/post-receive script. New change to branch master in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 60ccaf5 Merge branch 'release/1.5.8' adds 220f4e5 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e59de1a Merge branch 'master' into develop adds 109556a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds e7e7dde fixes #1141: Fix some french i18n sentences (do not use edit in french but modifier) adds bd0368e fixes #1143: Be able to configure authenticated email sending adds 69ac33d fixes #1142: Do not use anymore the dynamic methods (improve security) adds 52f0d9f fixes #1144: Fix again configuration page on site adds f13a6c4 fix back release files adds e5faca5 [jgitflow-maven-plugin]updating poms for branch '1.5.9' with snapshot versions adds ebed983 [jgitflow-maven-plugin]updating poms for branch'release/1.5.9' with non-snapshot versions adds 83a375c Merge branch 'release/1.5.9' No new revisions were added by this update. Summary of changes: pollen-persistence/pom.xml | 2 +- .../org/chorem/pollen/PollenConfiguration.java | 24 +++++++++++ .../chorem/pollen/PollenConfigurationOption.java | 12 ++++++ .../i18n/pollen-persistence_en_GB.properties | 4 ++ .../i18n/pollen-persistence_fr_FR.properties | 4 ++ pollen-services/pom.xml | 2 +- .../chorem/pollen/services/impl/EmailService.java | 9 +++- pollen-ui-struts2/pom.xml | 6 +-- .../src/main/resources/config/struts-admin.xml | 4 +- .../src/main/resources/config/struts-io.xml | 4 +- .../src/main/resources/config/struts-poll.xml | 36 ++++++++-------- .../src/main/resources/config/struts-user.xml | 49 ++++++++++++++-------- .../i18n/pollen-ui-struts2_en_GB.properties | 1 + .../i18n/pollen-ui-struts2_fr_FR.properties | 11 ++--- pollen-ui-struts2/src/main/resources/struts.xml | 3 +- .../webapp/WEB-INF/decorators/layout-default.jsp | 8 ++-- .../webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp | 7 ++-- .../main/webapp/WEB-INF/jsp/admin/usersList.jsp | 10 ++--- .../webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp | 6 +-- .../webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp | 6 +-- .../webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp | 6 +-- .../WEB-INF/jsp/poll/confirmDeletePollChoice.jsp | 6 +-- .../WEB-INF/jsp/poll/confirmDeletePollComment.jsp | 6 +-- .../WEB-INF/jsp/poll/confirmDeletePollVote.jsp | 6 +-- .../src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/vote.jsp | 9 ++-- .../WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp | 6 +-- .../WEB-INF/jsp/user/confirmDeletePollAccount.jsp | 6 +-- .../main/webapp/WEB-INF/jsp/user/createdList.jsp | 2 +- .../webapp/WEB-INF/jsp/user/dialogLostPassword.jsp | 5 +-- .../src/main/webapp/WEB-INF/jsp/user/edit.jsp | 4 +- .../main/webapp/WEB-INF/jsp/user/favoriteList.jsp | 15 +++---- .../main/webapp/WEB-INF/jsp/user/favoriteLists.jsp | 7 ++-- .../src/main/webapp/WEB-INF/jsp/user/login.jsp | 5 +-- .../src/main/webapp/WEB-INF/jsp/user/register.jsp | 3 +- .../src/main/webapp/WEB-INF/jsp/user/show.jsp | 5 +-- 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 | 17 +++----- src/site/fr/rst/configure.rst | 6 ++- src/site/rst/configure.rst | 6 ++- 48 files changed, 191 insertions(+), 157 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.