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
..
dmp-create-wizard	dmp advanced editor changed to remain at the same page when saving	2019-12-11 16:51:03 +02:00
invitation	dmp advanced editor changed to remain at the same page when saving	2019-12-11 16:51:03 +02:00
dmp-dynamic-field-dependency.ts	ui resrtucturing	2019-01-18 19:03:45 +02:00
dmp-dynamic-field.ts	ui resrtucturing	2019-01-18 19:03:45 +02:00
dmp-listing.ts	Adds dashboard data on tabs	2020-06-30 19:40:01 +03:00
dmp-overview.ts	Adds dashboard data on tabs	2020-06-30 19:40:01 +03:00
dmp.ts	Add language column on the DMP quick wizard Editor (ref #273)	2020-06-18 15:55:15 +03:00