This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from cbbd6ae [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 2d68325 ajout du signe Sex.UNKNOWN (refs #7536) new 5076694 register unknown sex sign (refs #7536) new b15c54b colonne SEX, interpréter None en ne créant pas de fils "Non sexe" (sauf si pour cette espèce il y a une autre catégorie dans la colonne SEX. Dans ce cas il faut créer le fils "Non sexe" qui sera frère de, par exemple, Male) new 23e84a3 Ajout d'un test pour valider l'import BigFin new e77ecad [IMPORT BIGFIN] colonne SEX interpréter Unkknown en "UNK - Indetermine" et None en ne créant pas de fils "Non sexe" termine #7536 Merge branch 'feature/7536' into develop new 4f5990b fixes #7537 [IMPORT BIGFIN] gestion des poids new 2c302db Modification du test d'import BigFin new 1d72ceb [IMPORT BIGFIN] gestion des poids termine #7537 Merge branch 'feature/7537' into develop new 0b74aad [ERGO] modifier un libellé dans un message termine #7526 The 9 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 0b74aad0a4cd7b9dac62a12e04024d923b8838e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 19 11:20:13 2015 +0200 [ERGO] modifier un libellé dans un message termine #7526 commit 1d72cebd24c04324c4214d34ced9dce6ddbd80c1 Merge: e77ecad 2c302db Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 19 11:16:36 2015 +0200 [IMPORT BIGFIN] gestion des poids termine #7537 Merge branch 'feature/7537' into develop commit 2c302db98a36a61bcb5758dbd92195826ee66dec Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 19 11:16:19 2015 +0200 Modification du test d'import BigFin commit 4f5990bb0bdc4c80ef454ef36c448e97917a4b57 Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 18 16:37:00 2015 +0200 fixes #7537 [IMPORT BIGFIN] gestion des poids commit e77ecad45649f8e5decc80e03887c62f91ec8c69 Merge: cbbd6ae 23e84a3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 19 10:57:05 2015 +0200 [IMPORT BIGFIN] colonne SEX interpréter Unkknown en "UNK - Indetermine" et None en ne créant pas de fils "Non sexe" termine #7536 Merge branch 'feature/7536' into develop commit 23e84a3e5b499bd54009af2ed72334d6d7d61679 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 19 10:57:02 2015 +0200 Ajout d'un test pour valider l'import BigFin commit b15c54bff64e3a77072f277d1f0361514e6c7f34 Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 18 14:22:08 2015 +0200 colonne SEX, interpréter None en ne créant pas de fils "Non sexe" (sauf si pour cette espèce il y a une autre catégorie dans la colonne SEX. Dans ce cas il faut créer le fils "Non sexe" qui sera frère de, par exemple, Male) commit 50766949952c56f25005ab5fda97de83f4224192 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 17 17:43:19 2015 +0200 register unknown sex sign (refs #7536) commit 2d68325fe8bc693fc9aecc30fabe48936598a7bf Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 17 16:27:12 2015 +0200 ajout du signe Sex.UNKNOWN (refs #7536) Summary of changes: .../entities/data/SpeciesAbleBatchs.java | 16 +- .../service/util/BatchPersistenceHelper.java | 4 +- .../tutti/service/bigfin/BigfinImportService.java | 53 +- .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 22 +- .../ifremer/tutti/service/bigfin/signs/Sign.java | 8 +- .../ifremer/tutti/service/bigfin/signs/Size.java | 6 +- .../tutti/service/bigfin/signs/VracHorsVrac.java | 4 +- .../service/bigfin/BigfinImportService2Test.java | 188 +- .../importbigfin2.tuttiProtocol} | 4105 ++++++++++---------- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 10 files changed, 2291 insertions(+), 2117 deletions(-) copy tutti-service/src/test/resources/{pupitri/ano-3898.tuttiProtocol => bigfin/importbigfin2.tuttiProtocol} (57%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.