[Wao-commits] branch develop updated (1f3474a -> 90b80fd)

13 Jan 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  1f3474a   Correction du calcul du réal en jours de mer dans ObsMer
       new  6dac550   On gère l'absence de AphiaId (fixes #5973)
       new  5c5786f   Correction clé bundle i18n
       new  6b25c5a   Correction NPE
       new  6687a87   Correction appel i18n dans JSP
       new  90b80fd   Correction de l'import du plan scléro (refs #2263)

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 90b80fd972944e5860dcef1855f9595227d28b79
Author: Brendan Le Ny <bleny@codelutin.com>
Date:   Tue Jan 13 15:45:08 2015 +0100

    Correction de l'import du plan scléro (refs #2263)

commit 6687a87764387fa173a1b9633e166b194c355d32
Author: Brendan Le Ny <bleny@codelutin.com>
Date:   Tue Jan 13 15:44:53 2015 +0100

    Correction appel i18n dans JSP

commit 6b25c5a920da5fac639388a4cf1a23c9c6ac2cd4
Author: Brendan Le Ny <bleny@codelutin.com>
Date:   Tue Jan 13 15:30:06 2015 +0100

    Correction NPE

commit 5c5786f3e6cb01ed7cbc6147e221ad2279a8bc54
Author: Brendan Le Ny <bleny@codelutin.com>
Date:   Tue Jan 13 15:09:24 2015 +0100

    Correction clé bundle i18n

commit 6dac5501bce39a2d923245907cbb2a004274007f
Author: Brendan Le Ny <bleny@codelutin.com>
Date:   Tue Jan 13 15:08:33 2015 +0100

    On gère l'absence de AphiaId (fixes #5973)

Summary of changes:
 .../src/main/java/fr/ifremer/wao/entity/Companies.java     |  2 +-
 .../src/main/java/fr/ifremer/wao/entity/Organisations.java | 12 ++++++++++++
 .../wao/services/service/UpdateSampleRowCommand.java       |  3 ++-
 .../wao/services/service/csv/SpeciesImportModel.java       | 14 ++++++++++++--
 .../csv/operations/OrganisationParserFormatter.java        |  2 +-
 wao-services/src/test/resources/import/especes.csv         |  4 ++--
 wao-web/src/main/resources/i18n/wao-web_fr_FR.properties   |  2 +-
 .../WEB-INF/content/administration/edit-laboratory.jsp     |  8 ++++++--
 8 files changed, 37 insertions(+), 10 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

[Wao-commits] branch develop updated (1f3474a -> 90b80fd)

codelutin.com scm