Diamantis Tziotzios e65bce0f5a Merge branch 'ui-redesign' into Development ... # Conflicts: # dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java # dmp-backend/web/src/main/java/eu/eudat/models/data/external/ResearchersExternalSourcesModel.java # dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml		2020-10-06 16:43:20 +03:00
..
cache	Add DMP Zenodo license field (ref #274)	2020-06-26 11:46:18 +03:00
configurations	Updated Elastic stack in order to store log files and add (expirimental) dataset index	2020-03-09 16:47:32 +02:00
controllers	DMP's create or Update endpoint will return a DMP model	2020-10-01 18:54:01 +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 'ui-redesign' into Development	2020-10-06 16:43:20 +03:00
models	Merge branch 'ui-redesign' into Development	2020-10-06 16:43:20 +03:00
types	Renames "Project" to "Grant on backend. (Issue #145)	2019-07-31 17:57:34 +03:00
EuDatApplication.java	no message	2018-10-02 17:33:58 +03:00