Diamantis Tziotzios bfc6b63067 Merge branch 'Development' ... # Conflicts: # dmp-backend/src/main/java/rest/entities/DMPs.java # dmp-backend/src/main/java/rest/entities/DataRepositories.java # dmp-backend/src/main/java/rest/entities/DatasetProfiles.java # dmp-backend/src/main/java/rest/entities/Datasets.java # dmp-backend/src/main/java/rest/entities/DmpProfiles.java # dmp-backend/src/main/java/rest/entities/Organisations.java # dmp-backend/src/main/java/rest/entities/Projects.java # dmp-backend/src/main/java/rest/entities/Registries.java # dmp-backend/src/main/java/rest/entities/Researchers.java # dmp-backend/src/main/java/rest/entities/Services.java # dmp-backend/src/main/java/rest/entities/Users.java # dmp-frontend/src/app/app.component.ts # dmp-frontend/src/app/login/googgle-sign-in/googgle-sign-in.component.ts # dmp-frontend/src/assets/custom.js # dmp-frontend/src/index.html		2018-01-18 12:45:51 +02:00
dmp-admin	no message	2018-01-18 12:27:30 +02:00
dmp-backend	Merge branch 'Development'	2018-01-18 12:45:51 +02:00
dmp-db-scema	added foreign keys	2017-11-17 00:13:39 +01:00
dmp-frontend	Merge branch 'Development'	2018-01-18 12:45:51 +02:00
dmp-javascript-engine	Initial import of DMP project modules.	2017-09-14 13:43:44 +03:00
logs	no message	2018-01-17 14:03:51 +02:00
.gitignore	no message	2018-01-18 12:27:30 +02:00
hs_err_pid11912.log	no message	2018-01-11 18:19:15 +02:00
hs_err_pid11972.log	no message	2018-01-11 18:19:15 +02:00
hs_err_pid12228.log	no message	2018-01-11 18:19:15 +02:00
hs_err_pid12896.log	no message	2018-01-11 18:19:15 +02:00
package-lock.json	new http call , fieldgroups	2017-09-18 13:18:17 +03:00