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
..
Docker	Improve self deployment	2020-04-27 16:21:03 +03:00
data	Add support for newer versions of java (11) (expirimental)	2020-06-29 12:50:35 +03:00
elastic	Fixed issue when creating new Datasets	2020-04-21 12:41:37 +03:00
queryable	Replaced System.out.println, System.err.println and printStackTrace with a logger (ref #223)	2020-01-16 17:46:24 +02:00
web	Merge branch 'Development' into ui-redesign	2020-07-03 11:21:46 +03:00
Dockerfile	Improved deployment	2020-05-12 13:10:23 +03:00
package-lock.json	changes	2017-10-18 11:29:22 +03:00
pom.xml	Add support for newer versions of java (11) (expirimental)	2020-06-29 12:50:35 +03:00