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
..
common/enum	Merge branch 'Development' into ui-redesign	2020-07-03 11:21:46 +03:00
model	Merge branch 'Development' into ui-redesign	2020-07-03 11:21:46 +03:00
pipes	Adds the multiple autocomplete functionality on Combo Box Autocomplete.	2019-03-26 17:09:02 +02:00
query	Merge branch 'Development' into ui-redesign	2020-07-03 11:21:46 +03:00
services	Merge branch 'Development' into ui-redesign	2020-07-03 11:21:46 +03:00
admin-auth-guard.service.ts	Added Admin Auth Guard Service in order to prevent registered and non registered users to access admin components by just using their url paths	2020-02-03 17:53:25 +02:00
auth-guard.service.ts	ui resrtucturing	2019-01-18 19:03:45 +02:00
core-service.module.ts	Add currency field type for dataset templates	2020-06-25 13:00:29 +03:00
formatting.module.ts	Adds the multiple autocomplete functionality on Combo Box Autocomplete.	2019-03-26 17:09:02 +02:00