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
..
cache	Update Spring boot framework to version 2.5.2	2021-09-07 09:42:31 +03:00
configurations	Update Spring boot framework to version 2.5.2	2021-09-07 09:42:31 +03:00
controllers	Merge branch 'spring-update' into Development	2021-10-08 16:04:52 +03:00
criteria	Add criteria for the recent activity model	2020-07-02 11:57:59 +03:00
exceptions	Re organize DMP controller and manager functions and added the ability to add custom organization (not configurable yet) (ref #255)	2020-04-22 18:40:43 +03:00
logic	Merge branch 'spring-update' into Development	2021-10-08 16:04:52 +03:00
models	Merge branch 'spring-update' into Development	2021-10-08 16:04:52 +03:00
types	Minor metrics refactor	2021-10-05 13:09:02 +03:00
EuDatApplication.java	Update Spring boot framework to version 2.5.2	2021-09-07 09:42:31 +03:00