Diamantis Tziotzios 366dcf6e01 Merge branch 'reference-type-refactor' into dmp-refactoring ... # Conflicts: # dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html # dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html # dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.html # dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.ts		2024-02-12 18:33:21 +02:00
..
Docker	dockerization	2022-09-13 10:35:56 +03:00
core	Merge branch 'reference-type-refactor' into dmp-refactoring	2024-02-12 18:33:21 +02:00
data	Refactoring public api dependencies from 'to be deleted' data and queryable modules	2024-02-09 13:24:23 +02:00
queryable	Refactoring public api dependencies from 'to be deleted' data and queryable modules	2024-02-09 13:24:23 +02:00
web	Merge branch 'reference-type-refactor' of code-repo.d4science.org:MaDgiK-CITE/argos into reference-type-refactor	2024-02-12 17:44:46 +02:00
Dockerfile	dockerization	2022-09-13 10:35:56 +03:00
Dockerfile.CI	no message	2023-10-12 10:57:38 +03:00
package-lock.json	changes	2017-10-18 11:29:22 +03:00
pom.xml	change description properties definition	2024-02-06 12:27:47 +02:00