Diamantis Tziotzios 1615707418 Merge branch 'Development' into ui-redesign ... # Conflicts: # dmp-frontend/src/app/app-routing.module.ts # dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss # dmp-frontend/src/app/ui/navbar/navbar.component.html # dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html # dmp-frontend/src/assets/i18n/en.json # dmp-frontend/src/assets/i18n/es.json # dmp-frontend/src/assets/i18n/gr.json		2020-07-03 11:21:46 +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	Merge branch 'Development' into ui-redesign	2020-07-03 11:21:46 +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 'Development' into ui-redesign	2020-07-03 11:21:46 +03:00
models	Merge branch 'Development' into ui-redesign	2020-07-03 11:21:46 +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