This is an automated email from the git hooks/post-receive script. New change to branch master in repository wao. See http://git.codelutin.com/wao.git from 29a5c2b Merge branch 'release/5.0-RC4' adds e9de68c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 9f71c77 Merge branch 'master' into develop adds aa3b322 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5b554cb On renomme la colonne « Zone de pêche » du plan en « Division » pour correspondre avec les filtres (testable-client #6679) adds 6c353e5 Manque un espace dans le filtre espèce entre le nom latin et la parenthèse (testable-client #6680) adds dfd5d32 Erreur de frappe dans le choix des paramètres à mesurer (testable-client #6681) adds ea29248 On tri les observateurs dans le formulaire de contact selon le nom puis le prénom en ignorant la casse (testable-client #6684) adds 9b3a659 On désactive l'envoi de mail si pas de SMTP configuré, on supprime la notion de devMode (termine #6685) adds b0e0de5 [jgitflow-maven-plugin]updating poms for branch '5.0-RC5' with snapshot versions adds 4f267c7 Correction d'une NPE lors des tests adds 80d9669 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC5' with non-snapshot versions adds 86eaaef Merge branch 'release/5.0-RC5' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../src/main/java/fr/ifremer/wao/WaoApplicationConfig.java | 5 ----- .../src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java | 5 ----- .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 2 +- wao-services/pom.xml | 2 +- .../main/java/fr/ifremer/wao/services/service/ContactsService.java | 2 +- .../java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java | 2 +- .../main/java/fr/ifremer/wao/services/service/mail/EmailService.java | 5 +++-- .../src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java | 2 ++ wao-web/pom.xml | 2 +- wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp | 2 +- wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp | 2 +- .../main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- 14 files changed, 15 insertions(+), 22 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.