Efstratios Giannopoulos 48352f0461 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring ... # Conflicts: # dmp-frontend/src/app/core/common/enum/app-role.ts # dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts # dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html # dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss # dmp-frontend/src/assets/i18n/en.json		2024-04-16 11:12:49 +03:00
..
config	Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring	2024-04-16 11:12:49 +03:00
logging	update logging, db configurations	2023-11-08 13:37:16 +02:00
material	create Supportive Material query public	2023-11-06 15:25:04 +02:00
Semantics.json	fix typo (semantics)	2023-05-19 12:34:08 +03:00
messages.properties	more dmp validation changes	2024-04-09 11:48:20 +03:00
messages_el.properties	DmpBlueprint refacto	2023-10-23 15:58:33 +03:00