February 2015 - Wao-commits - mailman.cloud.codelutin.com

branch release/5.0-RC5 created (now b0e0de5)
by codelutin.com scm Feb. 18, 2015

Feb. 18, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC5 in repository wao. See http://git.codelutin.com/wao.git at b0e0de5 [jgitflow-maven-plugin]updating poms for branch '5.0-RC5' with snapshot versions This branch includes the following new commits: new b0e0de5 [jgitflow-maven-plugin]updating poms for branch '5.0-RC5' 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 b0e0de59727ae5163122764ac2ce6706c81c68e9 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Feb 18 16:59:39 2015 +0000 [jgitflow-maven-plugin]updating poms for branch '5.0-RC5' with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (ea29248 -> 9b3a659)
by codelutin.com scm Feb. 18, 2015

Feb. 18, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from ea29248 On tri les observateurs dans le formulaire de contact selon le nom puis le prénom en ignorant la casse (testable-client #6684) new 9b3a659 On désactive l'envoi de mail si pas de SMTP configuré, on supprime la notion de devMode (termine #6685) 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 9b3a659c4da853997c981331ce85157baac07542 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Feb 18 17:46:59 2015 +0100 On désactive l'envoi de mail si pas de SMTP configuré, on supprime la notion de devMode (termine #6685) Summary of changes: .../src/main/java/fr/ifremer/wao/WaoApplicationConfig.java | 5 ----- .../src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java | 5 ----- .../main/java/fr/ifremer/wao/services/service/mail/EmailService.java | 5 +++-- 3 files changed, 3 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (dfd5d32 -> ea29248)
by codelutin.com scm Feb. 18, 2015

Feb. 18, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from dfd5d32 Erreur de frappe dans le choix des paramètres à mesurer (testable-client #6681) new ea29248 On tri les observateurs dans le formulaire de contact selon le nom puis le prénom en ignorant la casse (testable-client #6684) 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 ea2924827b4630f3a2f03e793fa92c3401d96d00 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Feb 18 15:02:07 2015 +0100 On tri les observateurs dans le formulaire de contact selon le nom puis le prénom en ignorant la casse (testable-client #6684) Summary of changes: .../src/main/java/fr/ifremer/wao/services/service/ContactsService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (5b554cb -> dfd5d32)
by codelutin.com scm Feb. 18, 2015

Feb. 18, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 5b554cb On renomme la colonne « Zone de pêche » du plan en « Division » pour correspondre avec les filtres (testable-client #6679) new 6c353e5 Manque un espace dans le filtre espèce entre le nom latin et la parenthèse (testable-client #6680) new dfd5d32 Erreur de frappe dans le choix des paramètres à mesurer (testable-client #6681) 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 dfd5d324107dbf2987043a07b139119356acee5e Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Feb 18 14:49:19 2015 +0100 Erreur de frappe dans le choix des paramètres à mesurer (testable-client #6681) commit 6c353e568e98dfe123945670322e9465352b8253 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Feb 18 14:48:00 2015 +0100 Manque un espace dans le filtre espèce entre le nom latin et la parenthèse (testable-client #6680) Summary of changes: .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 2 +- .../java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (aa3b322 -> 5b554cb)
by codelutin.com scm Feb. 18, 2015

Feb. 18, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from aa3b322 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 5b554cb On renomme la colonne « Zone de pêche » du plan en « Division » pour correspondre avec les filtres (testable-client #6679) 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 5b554cb035f58f547118fb495ea6727a3e91f022 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Feb 18 14:44:31 2015 +0100 On renomme la colonne « Zone de pêche » du plan en « Division » pour correspondre avec les filtres (testable-client #6679) Summary of changes: 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 +- .../src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (64f3e3d -> aa3b322)
by codelutin.com scm Feb. 13, 2015

Feb. 13, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 64f3e3d On autorise "text/plain" comme type MIME pour les fichiers CSV (termine #6664) new e9de68c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds cfd8f88 [jgitflow-maven-plugin]updating poms for branch '5.0-RC4' with snapshot versions new 274da5a [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC4' with non-snapshot versions new 29a5c2b Merge branch 'release/5.0-RC4' new 9f71c77 Merge branch 'master' into develop new aa3b322 [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 aa3b322c41ff1756cf410bfc1ef9396ac61b38d8 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Feb 13 14:07:46 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9f71c773a19f091eaad5d89fd889ce0f79f0f7a8 Merge: e9de68c 29a5c2b Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Feb 13 14:07:45 2015 +0000 Merge branch 'master' into develop commit e9de68c4c880842f679d5279ccec5d10612bc860 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Feb 13 14:07:45 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 29a5c2bbaf378180ea48b058cbeb3eee86c5e575 Merge: ff93260 274da5a Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Feb 13 14:07:44 2015 +0000 Merge branch 'release/5.0-RC4' commit 274da5a82d14edf246679ab826b2edbe801242e8 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Feb 13 14:05:14 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC4' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

annotated tag wao-5.0-RC4 created (now 34f202f)
by codelutin.com scm Feb. 13, 2015

Feb. 13, 2015

This is an automated email from the git hooks/post-receive script. New change to annotated tag wao-5.0-RC4 in repository wao. See http://git.codelutin.com/wao.git at 34f202f (tag) tagging 29a5c2bbaf378180ea48b058cbeb3eee86c5e575 (commit) replaces wao-5.0-RC3 tagged by Maven Release on Fri Feb 13 14:07:44 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 5.0-RC4 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/5.0-RC4 deleted (was 274da5a)
by codelutin.com scm Feb. 13, 2015

Feb. 13, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC4 in repository wao. See http://git.codelutin.com/wao.git was 274da5a [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC4' 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 codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (ff93260 -> 29a5c2b)
by codelutin.com scm Feb. 13, 2015

Feb. 13, 2015

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 ff93260 Merge branch 'release/5.0-RC3' adds 52ea7b4 Dans l'onglet Navires, on ne doit pas voir les navires Scléro (testable-client #6658) adds cb06485 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a48664a Merge branch 'master' into develop adds 09464e0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 728c958 Mise à jour de develop local après release adds 5d7bcdc Correction du tri des utilisateurs dans l'administration, on perdait les homonymes (termine #6666) adds 64f3e3d On autorise "text/plain" comme type MIME pour les fichiers CSV (termine #6664) adds cfd8f88 [jgitflow-maven-plugin]updating poms for branch '5.0-RC4' with snapshot versions adds 274da5a [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC4' with non-snapshot versions adds 29a5c2b Merge branch 'release/5.0-RC4' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../java/fr/ifremer/wao/entity/BoatTopiaDao.java | 2 ++ .../entity/SclerochronologySamplingContext.java | 16 +++++++++++++-- .../main/java/fr/ifremer/wao/entity/WaoUsers.java | 24 ++++++++++++++++++++++ wao-services/pom.xml | 2 +- .../service/administration/WaoUsersList.java | 2 +- wao-web/pom.xml | 2 +- .../wao/web/action/AbstractImportCsvAction.java | 2 +- 9 files changed, 46 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/5.0-RC4 updated (cfd8f88 -> 274da5a)
by codelutin.com scm Feb. 13, 2015

Feb. 13, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC4 in repository wao. See http://git.codelutin.com/wao.git from cfd8f88 [jgitflow-maven-plugin]updating poms for branch '5.0-RC4' with snapshot versions adds 274da5a [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC4' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0