DESKTOP-4ES9U2E\aldom 16c124cc3d Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development ... # Conflicts: # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetIdRDAMapper.java # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DistributionRDAMapper.java # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/HostRDAMapper.java # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/KeywordRDAMapper.java # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/LicenseRDAMapper.java # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/SecurityAndPrivacyRDAMapper.java # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/TechnicalResourceRDAMapper.java		2021-12-30 11:28:15 +02:00
..
Docker	Improve self deployment	2020-04-27 16:21:03 +03:00
data	Add transactional to makeFinalize on DMP and remove jackson parsing when depositing to zenodo	2021-11-18 18:27:20 +02:00
elastic	Fix minor issue with elastic date parsing	2021-12-09 15:11:07 +02:00
queryable	Add a special query logic with group by and count	2021-10-20 12:40:44 +03:00
web	Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development	2021-12-30 11:28:15 +02:00
Dockerfile	Improved deployment	2020-05-12 13:10:23 +03:00
Dockerfile.CI	Dockerfile update	2021-10-13 18:47:41 +03:00
package-lock.json	changes	2017-10-18 11:29:22 +03:00
pom.xml	Update some maven dependencies	2021-12-14 12:09:15 +02:00