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
..
builders	When creating a new credential assign the user's email	2020-10-27 18:08:16 +02:00
handlers	Adds "Role" filter on Published DMPs and Published Dataset Description on backend. (Issue #175)	2019-09-26 18:33:41 +03:00
managers	Merge commit '2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf'	2021-12-09 12:18:39 +02:00
mapper/elastic	Fix issue with elasticsearch inconsistencies	2021-11-23 14:05:57 +02:00
proxy	Fix and improve remote fetcher caching	2021-11-29 17:26:29 +02:00
security	Sanitize user output on frontend	2020-07-17 13:19:10 +03:00
services	Allow to configure the path of the email templates (ref #7122)	2021-10-25 16:06:08 +03:00
utilities	Add support for the exported date format on wordBuilder	2021-11-24 16:41:01 +02:00