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

22 Jul, 2021 9 commits
- Merge branch 'release/1.10.2' · 720979c3
  LAVENIER authored Jul 22, 2021
  
  720979c3
- Update versions for release · 99547afb
  LAVENIER authored Jul 22, 2021
  
  99547afb
- [enh] Model: Add MatricEnum.INDIVIDUAL · 2649ef93
  LAVENIER authored Jul 22, 2021
  
  2649ef93
- Merge remote-tracking branch 'origin/develop' into develop · 373f2198
  LAVENIER authored Jul 22, 2021
  
  373f2198
- [fix] Rename some software property (for enumeration) · c529b239
  LAVENIER authored Jul 22, 2021
  
  c529b239
- Merge remote-tracking branch 'origin/develop' into develop · 3e2289e3
  PECQUOT authored Jul 22, 2021
```
# Conflicts:
#	sumaris-test-shared/src/main/resources/data-hsqldb-06-configs.xml
```
  3e2289e3
- [fix] test data · d14baccb
  PECQUOT authored Jul 22, 2021
  
  d14baccb
- [fix] test data · 5a6c06ee
  PECQUOT authored Jul 22, 2021
  
  5a6c06ee
- [enh] EntityEnums: add warning if Reflections.collect() cannot be used in production mode · 96bf5e18
  PECQUOT authored Jul 22, 2021
  
  96bf5e18
21 Jul, 2021 1 commit
- [fix] Generate Reflection files AFTER compile phase (to make sure to export all classes and enums) · 7f227170
  LAVENIER authored Jul 21, 2021
  
  7f227170
20 Jul, 2021 13 commits
- Update for next development version · a60fbd6d
  LAVENIER authored Jul 20, 2021
  
  a60fbd6d
- Merge branch 'release/1.10.1' · 5bd51778
  LAVENIER authored Jul 20, 2021
  
  5bd51778
- Merge branch 'release/1.10.1' into develop · 1171539a
  LAVENIER authored Jul 20, 2021
  
  1171539a
- Update versions for release · 88c19bb3
  LAVENIER authored Jul 20, 2021
  
  88c19bb3
- [fix] Add a vessel filter (where clause) on program · 4627ae40
  LAVENIER authored Jul 20, 2021
  
  4627ae40
- [fix] Fix deploy scripts · 8ab1aa08
  LAVENIER authored Jul 20, 2021
  
  8ab1aa08
- Update for next development version · 3f92e414
  LAVENIER authored Jul 20, 2021
  
  3f92e414
- Merge branch 'release/1.10.0' into develop · 8027a200
  LAVENIER authored Jul 20, 2021
  
  8027a200
- Merge branch 'release/1.10.0' · 6b14b528
  LAVENIER authored Jul 20, 2021
  
  6b14b528
- Release 1.10.0\nUpdateObsdebFeature · f842de97
  LAVENIER authored Jul 20, 2021
  
  f842de97
- Update versions for release · e648a16e
  LAVENIER authored Jul 20, 2021
  
  e648a16e
- [fix] Liquibase: fix sequence rename · 324265ab
  LAVENIER authored Jul 20, 2021
  
  324265ab
- [enh] rename db-changelog-1.9.0 to db-changelog-1.10.0 · 2fdf4a19
  PECQUOT authored Jul 20, 2021
  
  2fdf4a19
19 Jul, 2021 7 commits
- Merge branch 'develop' into feature/obsdeb · 731d6aa8
  PECQUOT authored Jul 19, 2021
```
# Conflicts:
#	pom.xml
#	sumaris-core-extraction/pom.xml
#	sumaris-core-importation/pom.xml
#	sumaris-core-rdf/pom.xml
#	sumaris-core-shared/pom.xml
#	sumaris-core/pom.xml
#	sumaris-server/pom.xml
#	sumaris-test-shared/pom.xml
```
  731d6aa8
- [fix] Fix release scripts (add artifacts upload to github) · 8e7d76e1
  LAVENIER authored Jul 19, 2021
  
  8e7d76e1
- Update for next development version · c38bd4a5
  LAVENIER authored Jul 19, 2021
  
  c38bd4a5
- Merge branch 'release/1.9.0' into develop · 2aa2214f
  LAVENIER authored Jul 19, 2021
  
  2aa2214f
- Merge branch 'release/1.9.0' · a2d8786b
  LAVENIER authored Jul 19, 2021
  
  a2d8786b
- Release 1.9.0\nFixVesselSearchAndObservedLocationFilterOptions · cd837d60
  LAVENIER authored Jul 19, 2021
  
  cd837d60
- Update versions for release · ff403c98
  LAVENIER authored Jul 19, 2021
  
  ff403c98
16 Jul, 2021 9 commits
- [fix] Change menu icon for "sampling strategies" direct link · 2a2ee0b6
  LAVENIER authored Jul 16, 2021
  
  2a2ee0b6
- [fix] LandingRepositoryImpl.findAllByObservedLocationId Oracle condition · c2a40875
  PECQUOT authored Jul 16, 2021
  
  c2a40875
- [fix] Remove rankOrderOnVessel from Landing and LandingVO · c6f08e07
  PECQUOT authored Jul 16, 2021
```
[enh] add LandingRepositoryImpl.findAllByObservedLocationId with natural sort on vessel registration code
```
  c6f08e07
- [enh] Extraction: samples count with TAG_ID and not individual count (#485) · c2cadec7
  RANNOU authored Jul 16, 2021
  
  c2cadec7
- [enh] Service: samples count with TAG_ID and not individual count (#485) · 657faf06
  RANNOU authored Jul 16, 2021
  
  657faf06
- Merge branch 'develop' into feature/imagine · b2bd4950
  LAVENIER authored Jul 16, 2021
  
  b2bd4950
- [fix] Data: Rename TAG_ID pmfm name · 92ed6f32
  LAVENIER authored Jul 16, 2021
  
  92ed6f32
- [enh] Service/Dao: check if sample TAG_ID is unique on save (#385) · 9bfd1b85
  RANNOU authored Jul 16, 2021
  
  9bfd1b85
- Merge branch 'develop' into feature/obsdeb · 1f1ad377
  PECQUOT authored Jul 16, 2021
  
  1f1ad377
15 Jul, 2021 1 commit
- [fix] refactor FishingAreaRepository add ExpectedSaleRepository · 4639fe22
  PECQUOT authored Jul 15, 2021
```
[enh] add missing methods in ProductService
```
  4639fe22