Tony CHEMIT pushed to branch master at ultreiaio / ird-t3 Commits: 2bd7c888 by Tony CHEMIT at 2018-03-19T21:21:40Z [jgitflow-maven-plugin]updating poms for 2.5-SNAPSHOT development[skip ci] - - - - - 9f7b0dad by Tony CHEMIT at 2018-03-19T21:31:10Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 82e716ec by Tony CHEMIT at 2018-03-19T21:31:10Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 10eefb4d by Tony CHEMIT at 2018-03-19T21:31:11Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - fe6eccaf by Tony CHEMIT at 2018-03-19T22:31:03Z update changelog after release 2.4 skip ci] - - - - - 9bdaf9fa by Tony CHEMIT at 2018-03-19T22:31:45Z Fix migration scripts - - - - - 55c670bc by Tony CHEMIT at 2018-03-19T22:36:22Z fix deploy demo on release [skip ci] - - - - - f63dab1e by Tony CHEMIT at 2018-03-19T22:55:00Z Sélection par défaut du type d'échantillons (closes #296) - - - - - 985fcfc6 by Tony CHEMIT at 2018-03-19T22:55:48Z go to version 3.0 - - - - - 07250611 by Tony CHEMIT at 2018-03-20T09:27:44Z [N0.3] Conversion des catégories logbook - rendre générique la codification des catégories inconnues - utilisation version par défaut (See #287) - - - - - b6eea14f by Tony CHEMIT at 2018-03-20T14:46:29Z [N2][N3] Gestion des catégories de poids -10/+10kg dans la stratification N2 et N3 (See #263) - nettoyage de code et ajout de FIXME... - - - - - ff591952 by Tony CHEMIT at 2018-03-20T14:46:31Z [N1][N2][N3] Permettre la sélection mutliple d'océans (See #260) - correction sur le N1.5 (plus un peu de nettoyage de code) - - - - - 8a3cd0de by Tony CHEMIT at 2018-03-20T15:40:53Z [N0.2][LOG] Petite bizarerie dans les logs (See #239) - - - - - c2d5de35 by Tony CHEMIT at 2018-03-20T15:51:19Z fix typo in i18n - - - - - 176ea4c3 by Tony CHEMIT at 2018-03-20T16:00:47Z [REFERENTIEL] Rajouter des champs de traduction (See #245) - fix dans la grille des maréés - - - - - 21196bfc by Tony CHEMIT at 2018-03-22T02:20:55Z Great code refactor for level 2 and 3 (See #263) - - - - - 514feb71 by Tony CHEMIT at 2018-03-22T15:27:30Z improve Level 2 and 3 API + conversion API (See #263) - - - - - 2f995491 by Tony CHEMIT at 2018-03-23T10:11:08Z Go to version 2.5 + [N1.5] Remplacer SetSpeciesCatWeight.WeightCategorySample par WeightCategoryTreatment (Closes #301) + Review cache API - - - - - 3585d323 by Tony CHEMIT at 2018-03-23T13:30:48Z [N2][N3] Gestion des catégories de poids -10/+10kg dans la stratification N2 et N3 (See #263) - mise en place des filtres sur les strates - - - - - 179ad7bb by Tony CHEMIT at 2018-03-23T15:01:26Z add more tests for cache + fix some harbour oceans and fix his request) - - - - - 772a1f75 by Tony CHEMIT at 2018-03-23T17:00:07Z use t3 data 1.6 + introduce Activity cache - - - - - d5e63496 by Tony CHEMIT at 2018-03-23T17:41:36Z Simplification des bases en entrée (Closes #302) - - - - - 3c029fe5 by Tony CHEMIT at 2018-03-23T17:54:54Z [jgitflow-maven-plugin]updating poms for branch'release/2.5' with non-snapshot versions[skip ci] - - - - - 6869f44a by Tony CHEMIT at 2018-03-23T18:04:20Z use ird t3 data 1.7 - - - - - 7672dd82 by Tony CHEMIT at 2018-03-23T18:21:51Z fix i18n - - - - - 72eadee5 by Tony CHEMIT at 2018-03-23T18:22:48Z [jgitflow-maven-plugin]merging 'release/2.5' into 'master' - - - - - 24 changed files: - .gitlab-ci.yml - CHANGELOG.md - pom.xml - t3-actions/pom.xml - t3-actions/src/main/java/fr/ird/t3/FakeT3ServiceContext.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSampleSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleWeightToSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratumLoader.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2SampleStratum.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2SampleStratumLoader.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2SampleStratumLoaderAtlantic.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2SampleStratumLoaderIndian.java - + t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2StratumConfiguration.java - + t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2StratumConfigurationIteratorWithCategories.java - + t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2StratumConfigurationIteratorWithoutCategories.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2StratumResult.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java - + t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2InputContext.java - + t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2OutputContext.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/L3CatchStratum.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/L3CatchStratumLoader.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/395742084ad322ebf9ef4e324569f9e1... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/395742084ad322ebf9ef4e324569f9e1... You're receiving this email because of your account on gitlab.com.