George Kalampokis a3af8ce3a5 Merge branch 'spring-update' into Development ... # Conflicts: # dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java # dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java # dmp-backend/web/src/main/java/eu/eudat/controllers/UserGuideController.java # dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java # dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java # dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java # dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java		2021-10-08 16:04:52 +03:00
..
Docker	Improve self deployment	2020-04-27 16:21:03 +03:00
data	Merge branch 'spring-update' into Development	2021-10-08 16:04:52 +03:00
elastic	Add additional null check for Elastic's Dmp Repository	2021-10-08 11:18:22 +03:00
queryable	Optimize queries	2021-09-30 18:02:53 +03:00
web	Merge branch 'spring-update' into Development	2021-10-08 16:04:52 +03:00
Dockerfile	Improved deployment	2020-05-12 13:10:23 +03:00
Dockerfile.CI	ci updates	2020-12-16 14:19:58 +02:00
package-lock.json	changes	2017-10-18 11:29:22 +03:00
pom.xml	Merge branch 'spring-update' into Development	2021-10-08 16:04:52 +03:00