1. 05 Oct, 2021 3 commits
  2. 01 Oct, 2021 4 commits
    • PECQUOT's avatar
      Merge branch 'feature/obsdeb' into develop · 8c5a054d
      PECQUOT authored
      # Conflicts:
      #	sumaris-core/src/main/java/net/sumaris/core/service/data/AggregatedLandingServiceImpl.java
      #	sumaris-core/src/main/java/net/sumaris/core/service/data/LandingServiceImpl.java
      8c5a054d
    • PECQUOT's avatar
      Merge remote-tracking branch 'origin/develop' into develop · 6f9d502a
      PECQUOT authored
      # Conflicts:
      #	sumaris-core/src/main/java/net/sumaris/core/dao/administration/programStrategy/StrategyRepositoryImpl.java
      #	sumaris-core/src/main/java/net/sumaris/core/service/data/LandingServiceImpl.java
      #	sumaris-core/src/main/resources/net/sumaris/core/db/changelog/hsqldb/db-changelog-1.10.3.xml
      #	sumaris-core/src/main/resources/net/sumaris/core/db/changelog/hsqldb/db-changelog.xml
      6f9d502a
    • COTONNEC's avatar
      update doc submodule · 970a2e14
      COTONNEC authored
      970a2e14
    • COTONNEC's avatar
      [fix] Fix merge Imagine into develop · 41c53439
      COTONNEC authored
      41c53439
  3. 30 Sep, 2021 1 commit
    • COTONNEC's avatar
      Merge branch 'feature/imagine' into develop · 6c948a94
      COTONNEC authored
      # Conflicts:
      #	sumaris-core/src/main/java/net/sumaris/core/dao/data/trip/TripRepositoryImpl.java
      #	sumaris-core/src/main/java/net/sumaris/core/dao/data/trip/TripSpecifications.java
      #	sumaris-core/src/main/java/net/sumaris/core/vo/filter/TripFilterVO.java
      #	sumaris-core/src/main/resources/net/sumaris/core/db/changelog/hsqldb/db-changelog.xml
      6c948a94
  4. 29 Sep, 2021 3 commits
  5. 28 Sep, 2021 1 commit
  6. 27 Sep, 2021 1 commit
  7. 24 Sep, 2021 1 commit
  8. 23 Sep, 2021 4 commits
  9. 22 Sep, 2021 6 commits
  10. 20 Sep, 2021 3 commits
  11. 17 Sep, 2021 3 commits
  12. 15 Sep, 2021 2 commits
  13. 14 Sep, 2021 3 commits
  14. 13 Sep, 2021 3 commits
  15. 10 Sep, 2021 2 commits