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
..
clone	Fixed issue not passing DMP Extra Properties on clones and new Versions	2020-06-26 18:57:04 +03:00
editor	Merge branch 'Development' into ui-redesign	2020-07-03 11:21:46 +03:00
invitation	dmp advanced editor changed to remain at the same page when saving	2019-12-11 16:51:03 +02:00
listing	Adds dashboard data on tabs	2020-06-30 19:40:01 +03:00
overview	Merge branch 'Development' into ui-redesign	2020-07-03 11:21:46 +03:00
wizard	Fixed issue not passing DMP Extra Properties on clones and new Versions	2020-06-26 18:57:04 +03:00
dmp.module.ts	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
dmp.routing.ts	Add Dmp Index (ref #252), compacted Dmp Listing so now both the user and the public listing will use one component (ref #253) and refactor operation context	2020-04-01 18:16:06 +03:00