Diamantis Tziotzios 7a8375b988 Merge commit '2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf' ... # Conflicts: # dmp-backend/elastic/src/main/java/eu/eudat/elastic/criteria/DatasetCriteria.java # dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dataset.java # dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java # dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java # dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java # dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java # dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java # dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java # dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java		2021-12-09 12:18:39 +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	Add additional null check	2021-11-23 11:44:50 +02:00
queryable	Add a special query logic with group by and count	2021-10-20 12:40:44 +03:00
web	Merge commit '2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf'	2021-12-09 12:18:39 +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	Merge branch 'spring-update' into Development	2021-10-08 16:04:52 +03:00