This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 109556a [jgitflow-maven-plugin]Updating develop poms back to pre merge state new e7e7dde fixes #1141: Fix some french i18n sentences (do not use edit in french but modifier) new bd0368e fixes #1143: Be able to configure authenticated email sending new 69ac33d fixes #1142: Do not use anymore the dynamic methods (improve security) 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 69ac33dd3b2361fea36ca4d217a393e6ae573caf Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 14:02:50 2014 +0100 fixes #1142: Do not use anymore the dynamic methods (improve security) commit bd0368e81af4a39351de5dbf3d5837a0dd6adf02 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 14:02:16 2014 +0100 fixes #1143: Be able to configure authenticated email sending commit e7e7dded0c156b544ca7570598d95d96ba6ab194 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 13:45:50 2014 +0100 fixes #1141: Fix some french i18n sentences (do not use edit in french but modifier) Summary of changes: .../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 ++ .../chorem/pollen/services/impl/EmailService.java | 9 +++- .../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 +-- src/site/fr/rst/configure.rst | 6 ++- src/site/rst/configure.rst | 6 ++- 35 files changed, 172 insertions(+), 131 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.