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
..
cache	Fix and improve remote fetcher caching	2021-11-29 17:26:29 +02:00
configurations	Update Spring boot framework to version 2.5.2	2021-09-07 09:42:31 +03:00
controllers	Make dataset queries to return distinct results (avoid duplicate Id issues)	2021-11-24 16:23:02 +02:00
criteria	Add criteria for the recent activity model	2020-07-02 11:57:59 +03:00
exceptions	Re organize DMP controller and manager functions and added the ability to add custom organization (not configurable yet) (ref #255)	2020-04-22 18:40:43 +03:00
logic	Merge commit '2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf'	2021-12-09 12:18:39 +02:00
models	Fix critical issue with multiAutoComplete on autocomplete field types	2021-11-29 11:27:59 +02:00
types	no message	2021-12-06 15:32:38 +02:00
EuDatApplication.java	Update Spring boot framework to version 2.5.2	2021-09-07 09:42:31 +03:00