Commits · master · sih-public / sumaris / sumaris-pod

01 Mar, 2021 6 commits
- Merge branch 'release/1.7.2' · cf60a8d5
  LAVENIER authored Mar 01, 2021
  
  cf60a8d5
- Update versions for release · ca601072
  LAVENIER authored Mar 01, 2021
  
  ca601072
- Merge remote-tracking branch 'origin/feature/imagine' into feature/imagine · efeb8e84
  LAVENIER authored Mar 01, 2021
  
  efeb8e84
- [fix] Fix release dependency · 2789df37
  LAVENIER authored Mar 01, 2021
  
  2789df37
- Merge remote-tracking branch 'origin/feature/imagine' into feature/imagine · 4d45d1de
  CLEMENT authored Mar 01, 2021
  
  4d45d1de
- rollback on CLT : IMAGINE-287 [Ligne de plan] Créer une ligne de plan - PSFM... · ae765525
  CLEMENT authored Mar 01, 2021
```
rollback on CLT : IMAGINE-287 [Ligne de plan] Créer une ligne de plan - PSFM sexe / Add morse code and strategy label pmfms default ids
```
  ae765525
26 Feb, 2021 9 commits
- Update for next development version · 7ded70be
  LAVENIER authored Feb 26, 2021
  
  7ded70be
- Merge branch 'release/1.7.1' into develop · a9d85de5
  LAVENIER authored Feb 26, 2021
  
  a9d85de5
- Merge branch 'release/1.7.1' · 1a3ad998
  LAVENIER authored Feb 26, 2021
  
  1a3ad998
- Release 1.7.1\nFixForImagine · c6598041
  LAVENIER authored Feb 26, 2021
  
  c6598041
- Update versions for release · ac05a7a7
  LAVENIER authored Feb 26, 2021
  
  ac05a7a7
- [fix] Fix build EOL · d0a7a15d
  LAVENIER authored Feb 26, 2021
  
  d0a7a15d
- Merge branch 'feature/imagine' into develop · a2043614
  LAVENIER authored Feb 26, 2021
  
  a2043614
- [fix] Fix Core unit test · 4dab1d64
  LAVENIER authored Feb 26, 2021
  
  4dab1d64
- CLT : IMAGINE-287 [Ligne de plan] Créer une ligne de plan - PSFM sexe / Add... · f52aa875
  CLEMENT authored Feb 26, 2021
```
CLT : IMAGINE-287 [Ligne de plan] Créer une ligne de plan - PSFM sexe / Add morse code and strategy label pmfms default ids
```
  f52aa875
25 Feb, 2021 1 commit
- CLT : fix on organize imports · f34ebb5b
  CLEMENT authored Feb 25, 2021
  
  f34ebb5b
24 Feb, 2021 1 commit

[enh] Add DenormalizedPmfmStrategy repository, to fetch VO · a421a55e

LAVENIER authored Feb 24, 2021

[fix] Fix save AppliedPeriod (fix error 'same entity existing in session')
[fix] HSQLDB start scripts now use UTC timezone

a421a55e

19 Feb, 2021 3 commits
- [fix] Rename git branch develop-ifremer into feature/imagine · 90f30101
  LAVENIER authored Feb 19, 2021
  
  90f30101
- Merge branch 'develop-ifremer' into develop · 28e74763
  LAVENIER authored Feb 19, 2021
  
  28e74763
- [fix] Refactor UserProfileEnum · dfe9b24c
  LAVENIER authored Feb 19, 2021
  
  dfe9b24c
18 Feb, 2021 2 commits
- [fix] Dao: manage offset and size parameters in taxonName find method · 0d2a0ec7
  RANNOU authored Feb 18, 2021
  
  0d2a0ec7
- [enh] add variables into HsqlDB start scripts · 1616435f
  bl05b3e authored Feb 18, 2021
```
[fix] Use HsqlDB v1.4.1
```
  1616435f
16 Feb, 2021 3 commits
- [fix] Use UserProfileEnum in PersonRepositoryImpl, instead of reading software... · c04e5cbd
  bl05b3e authored Feb 16, 2021
```
[fix] Use UserProfileEnum in PersonRepositoryImpl, instead of reading software properties (because enum is already overwritten by config)
```
  c04e5cbd
- [enh] Dao: verify strategy label unicity on save · e1e66298
  RANNOU authored Feb 16, 2021
  
  e1e66298
- [fix] Data: clean parambio data · 046c76e4
  RANNOU authored Feb 16, 2021
  
  046c76e4
15 Feb, 2021 3 commits
- revert offline option · 8e7a2a51
  GARO authored Feb 15, 2021
  
  8e7a2a51
- add temporarily "offline" option in gitlabci maven build command line · 2d321bf0
  GARO authored Feb 15, 2021
  
  2d321bf0
- Merge remote-tracking branch 'origin/develop-ifremer' into feature/adap · 4020c995
  bl05b3e authored Feb 15, 2021
  
  4020c995
12 Feb, 2021 1 commit
- [fix] Dao: fix ignore case search on analytic reference · c18dcd6c
  RANNOU authored Feb 12, 2021
  
  c18dcd6c
09 Feb, 2021 3 commits
- [fix] Dao: fix ignore case search on analytic reference · 70e74c8a
  RANNOU authored Feb 09, 2021
  
  70e74c8a
- [fix] Dao: fix ignore case search on analytic reference · 08871058
  RANNOU authored Feb 09, 2021
  
  08871058
- [fix] Dao: fix strategy cache names · c1cf873c
  RANNOU authored Feb 09, 2021
  
  c1cf873c
08 Feb, 2021 1 commit
- [fix] Service: add graphql queries for parameter, matrix, fraction, method in pmfmStrategy context · 76dbe714
  RANNOU authored Feb 08, 2021
  
  76dbe714
05 Feb, 2021 7 commits

finish merge · 71bcaa24
bl05b3e authored Feb 05, 2021

71bcaa24
finish merge · 5e53371b
bl05b3e authored Feb 05, 2021

5e53371b
finish merge · e4dcaf9c
bl05b3e authored Feb 05, 2021

e4dcaf9c
finish merge · 9d8c4172
bl05b3e authored Feb 05, 2021

9d8c4172

Merge branch 'develop-ifremer' into develop · 6f9f1b32

bl05b3e authored Feb 05, 2021

# Conflicts:
#	sumaris-core-extraction/src/main/java/net/sumaris/core/extraction/dao/trip/rdb/ExtractionRdbTripDaoImpl.java
#	sumaris-core/src/main/java/net/sumaris/core/dao/administration/programStrategy/PmfmStrategyRepositoryImpl.java
#	sumaris-core/src/main/java/net/sumaris/core/dao/administration/programStrategy/StrategyRepositoryImpl.java
#	sumaris-core/src/main/java/net/sumaris/core/dao/referential/ReferentialDaoImpl.java
#	sumaris-core/src/main/java/net/sumaris/core/dao/technical/schema/SumarisDatabaseMetadata.java
#	sumaris-core/src/main/java/net/sumaris/core/model/administration/programStrategy/PmfmStrategy.java
#	sumaris-core/src/main/java/net/sumaris/core/service/referential/taxon/TaxonGroupServiceImpl.java
#	sumaris-core/src/test/java/net/sumaris/core/service/administration/ProgramServiceWriteTest.java
#	sumaris-server/src/main/java/net/sumaris/server/http/graphql/administration/ProgramGraphQLService.java
#	sumaris-test-shared/src/main/resources/data-hsqldb-06-configs.xml

6f9f1b32

Merge remote-tracking branch 'origin/develop-ifremer' into develop-ifremer · eab78a83
bl05b3e authored Feb 05, 2021

eab78a83
[fix] Data: fix program properties for OBSDEB and ADAP · cb74feac
bl05b3e authored Feb 05, 2021

cb74feac