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
..
.settings	dataset getpaged getsingle	2017-12-15 14:25:21 +02:00
src	Merge branch 'Development'	2018-01-18 12:45:51 +02:00
.classpath	Added more rest calls. Added a sample junit test.	2017-10-23 19:06:24 +03:00
.gitignore	Initial import of DMP project modules.	2017-09-14 13:43:44 +03:00
.project	Security is now completed... only token-based calls are now permitted.	2017-10-13 18:08:49 +03:00
package-lock.json	changes	2017-10-18 11:29:22 +03:00
pom.xml	no message	2018-01-18 12:27:30 +02:00