GitLab

at 2024-10-01T11:58:24+02:00

[jgitflow-maven-plugin]updating poms for 9.4.0-M2-SNAPSHOT development[skip ci]
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]
[jgitflow-maven-plugin]merging 'master' into 'develop'
[jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]
tidy poms

Remove module toolkit

Replace module toolkit by toolkit project

[core-api-services] - add empty ReferentialSecondLevelDeepBehaviourModel model

Merge branch 'feature/issue-2946' into develop
Suppression du projet du module toolkit - Closes #2946

Introduce WellIdAware and WellIdsAware from toolkit project.

Introduce WindAware from toolkit project.

Introduce WithSpeciesFaoCode and WithFormula from toolkit project.

[model] Introduce ObserveValidationTagValues to get ObServe specific validation tag-values

Introduce dto-validation-templates module to override ValidationTransformer

Use dto-validation-templates module and update WellIdXXXValidators

Introduce WithStartEndDate from toolkit project.

Merge branch 'feature/issue-2946-2' into develop
Suppression du projet du module toolkit - Closes #2946

[pom] use toolkit 10.0.1

Suppression du pom parent

Suppression de certains profiles déclanchés via des fichiers

add pmd plugin and let's generate javadoc when build site

fix dependency to make pmd report works

add mvn via mvnwrapper

do generate javadoc when building site

Merge branch 'feature/issue-2945' into develop
Suppression du pom parent qui pointe sur un projet de mon organisation -
Closes #2945

Souci de l'UI configuration sur les options de type liste - Closes #2956

Rename method ObjectMaterialDto.isCodeValid to ObjectMaterialDto.isCodeCompliantWithParent and improve it

Rename method ObjectMaterialDto.isCodeValid to ObjectMaterialDto.isCodeCompliantWithParent and improve it

Only validate code if material has a parent

Merge branch 'feature/issue_2952' into develop
Problème dans la consultation des données de référence Objet flottant matériel
- Closes #2952

Remove tagNumber data-binding (this is already done by the handler)

Remove tagNumber data-binding (this is already done by the handler)

Make number enabled when individual and disabled (with value removed) when grouped

Merge branch 'feature/issue_2950' into develop
LL/observations/capture : Champ numéro au virage devrait être désactivé en saisie groupée
- Closes #2950

use proper callback for the dedicated option (we need to reload database to recompute all permissions)

fix content title text and icon when db is editable

Merge branch 'feature/issue_2951' into develop
L'option d'édition du référentiel d'une base locale nécessite un rechargement manuel de la source de données - Closes #2951

Rename ImportDataContext.observedSystemCodes to ImportDataContext.avdthObservedSystemCodes

Clean ImportDataContext.avdthObservedSystemCodes at a better place and no more in FloatingObjectReader.resetContext method (which is removed)

Clean code

Now just clean the method to add observed system 20 if required from avdth observed system code found

Merge branch 'feature/issue_2961' into develop
2 mappings AVDTH ASSOC non fonctionnels - Closes #2961

Review import code for Landing.fate field

Update AVDTH documentation

Add by migration ps_landing.Fate 3 and 4 if necessary

Update tests fixtures

Merge branch 'feature/issue_2959' into develop
Peaufinage sur la migration des LOT_COM AVDTH - Closes #2959

Fix speciesList 100 labels

Fix speciesList 101 labels

add speciesList 102 and 103

Update tests fixtures

Merge branch 'feature/issue_2958' into develop
A propos des listes d'espèces pour les calculs de consolidation - Closes #2958

update data.ll.observation.FloatlinesComposition.length boundNauticalLength max value

update generated validation files

Update public api documentation

Merge branch 'feature/issue_2949' into develop
Bornes de longueurs d'orins en ftm - Closes #2949

Amélioration possible sur l'UI PS / Logbook / Echantillon / minus10weight et plus10weight - Closes #2954

Libellés sur l'UI consolidation - Closes #2957

Blocks ASAP re-entrant code

Do consolidate in Swing thread after all jaxx bindings have been done

Always reset weightComputedSource if model is can consolidate

Merge branch 'feature/issue_2953' into develop
Toute petite imperfection sur le formulaire PS / Lots de marché local - Closes #2953

update generated validation files - See #2949

Fix Pmd plugin version

Make site publish ok with gitlab CI

Remove Docker stage

Remove Docker stage

Update .gitlab-ci.yml file
Update .gitlab-ci.yml file

add scmpublish properties in pom properties to be able to use it in UpdateSiteVersion mojo

Fix client zip build

Update toolkit version to 10.0.2

Update generated tree path mappings

Update core-api-tree tests

Update core-services-test fixtures

Merge branch 'feature/issue_2960' into develop
L'UI de synchro de marées pose un problème sous Windows uniquement - Closes #2960

Update changelog for v.9.4.0-M2 [skip CI]

[jgitflow-maven-plugin]updating poms for 9.4.0-M2 branch with snapshot versions[skip ci]
[jgitflow-maven-plugin]updating poms for branch'release/9.4.0-M2' with non-snapshot versions[skip ci]
[jgitflow-maven-plugin]merging 'release/9.4.0-M2' into 'master'

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe

Commits:

1536 changed files:

The diff was not included because it is too large.