Efstratios Giannopoulos c27e98acd8 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring ... # Conflicts: # dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/PropertyDefinitionFieldSetPersist.java		2024-04-25 10:27:06 +03:00
..
core	Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring	2024-04-25 10:27:06 +03:00
web	Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring	2024-04-25 10:27:06 +03:00
Dockerfile	Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring	2024-04-08 13:34:36 +03:00
Dockerfile.Sonar	apply the same to the other api dockerfiles too	2024-04-23 14:40:37 +03:00
package-lock.json	changes	2017-10-18 11:29:22 +03:00
pom.xml	keycloak changes	2024-04-16 14:21:37 +03:00
settings.xml	Dockerfile changes	2024-04-08 13:31:46 +03:00
yarn.lock	Adding docs full structure and all pages, keeping built-in docusaurus tutorials temporarily (on separate category)	2024-04-18 16:57:12 +03:00