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
..
config	dmp overview re-design -- not completed: lock, remove, versions	2020-07-02 18:29:33 +03:00
css	Redesign of landing page, sign in interface, sidebar, navbar, dashboard (still in progress)	2020-06-26 12:08:51 +03:00
i18n	Merge branch 'Development' into ui-redesign	2020-07-03 11:21:46 +03:00
images	redesign_update	2020-06-29 18:30:36 +03:00
localization	Add ExtraProperties for DMP and language for Dataset Template	2020-06-03 12:13:31 +03:00
resources	Add Translations for the Language names and the Language Controller will retrieve it's files from a path instead of the classpath (ref #228)	2020-01-24 18:03:05 +02:00
scss	Redesign of landing page, sign in interface, sidebar, navbar, dashboard (still in progress)	2020-06-26 12:08:51 +03:00
splash	splash screen fixes	2020-07-02 18:08:05 +03:00
.gitkeep	Initial import of DMP project modules.	2017-09-14 13:43:44 +03:00