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
..
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	Add prefilling backend endpoints	2021-12-10 15:37:39 +02:00
mapper/elastic	Fix issue with elasticsearch inconsistencies	2021-11-23 14:05:57 +02:00
proxy	Add prefilling backend endpoints	2021-12-10 15:37:39 +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	Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development	2021-12-30 11:28:15 +02:00