Commit Graph

3611 Commits

Author SHA1 Message Date
annampak 3f791b1fde no message 2018-01-30 12:45:27 +02:00
annampak c3a478a5fb no message 2018-01-30 12:44:44 +02:00
annampak 70b443beb5 required field profile in Dmp editor 2018-01-30 12:44:18 +02:00
Ioannis Kalyvas f1ee3095f9 no message 2018-01-30 11:35:26 +02:00
Ioannis Kalyvas 56531976de no message 2018-01-26 18:08:17 +02:00
annampak f8e848ba1d no message 2018-01-26 18:01:26 +02:00
annampak f90e0d23cb Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-26 17:51:16 +02:00
annampak f390505f52 no message 2018-01-26 17:50:16 +02:00
Ioannis Kalyvas c6afac7ef6 no message 2018-01-26 17:49:17 +02:00
annampak 9f2d490e61 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts
2018-01-26 16:24:23 +02:00
annampak ae847c2db2 no message 2018-01-25 17:26:08 +02:00
Ioannis Kalyvas a47b5702dd no message 2018-01-25 17:24:21 +02:00
Ioannis Kalyvas 5ef8689e54 no message 2018-01-25 10:14:43 +02:00
annampak b30b5fd792 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-24 16:54:54 +02:00
annampak d1c9d00ba7 no message 2018-01-24 16:54:43 +02:00
Ioannis Kalyvas c6e2e8aec4 no message 2018-01-24 16:11:09 +02:00
annampak d7a4264af7 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-24 13:41:50 +02:00
annampak 4dd2acc44a saved dataset opens in 3rd step 2018-01-24 13:41:31 +02:00
Ioannis Kalyvas 00a1f80f01 no message 2018-01-24 13:29:53 +02:00
Ioannis Kalyvas f985d467d0 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-23 17:22:01 +02:00
Ioannis Kalyvas 76b4023f4a no message 2018-01-23 17:21:38 +02:00
annampak 4bd70ffdfb dmp associated users 2018-01-23 15:46:38 +02:00
annampak 46479118e7 dmp associated users, dmp cloning 2018-01-23 13:56:43 +02:00
annampak dcada74d7b num of datasets column 2018-01-23 10:49:54 +02:00
annampak 54734489e6 required field bug 2018-01-22 17:02:09 +02:00
annampak 22be00a799 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-22 16:29:05 +02:00
annampak 0d47fe0fd6 bugs with radiobox&combobox 2018-01-22 16:28:33 +02:00
Ioannis Kalyvas d2f6f0d898 no message 2018-01-22 09:41:31 +02:00
annampak 4f2fb712cf Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-19 17:19:13 +02:00
annampak 4741c31c0c make it public functionality 2018-01-19 17:19:02 +02:00
Ioannis Kalyvas c492d4d147 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-19 16:19:29 +02:00
Ioannis Kalyvas 0a82f368cd no message 2018-01-19 16:19:14 +02:00
annampak 62c4fb0547 no message 2018-01-19 15:59:48 +02:00
annampak 12062b0ef9 array of pages 2018-01-19 15:56:27 +02:00
Ioannis Kalyvas 64509cb2ee no message 2018-01-19 15:48:40 +02:00
Ioannis Kalyvas 04dd1145b5 no message 2018-01-19 13:35:09 +02:00
annabakouli 51e2deb180 no message 2018-01-19 13:11:22 +02:00
annabakouli 6a93ed8ef8 no message 2018-01-19 11:31:05 +02:00
annampak 24ce69db63 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-19 10:09:44 +02:00
annampak e4d1fd5398 make public butto, save and finalize, dataset profile field 2018-01-19 10:09:35 +02:00
annabakouli b2e49fbb8a no message 2018-01-18 12:55:35 +02:00
annabakouli 27ac98f9f6 no message 2018-01-18 12:47:11 +02:00
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
annabakouli 9bbaaa7f9e no message 2018-01-18 12:27:30 +02:00
Diamantis Tziotzios 943d121e98 no message 2018-01-18 11:10:16 +02:00
Diamantis Tziotzios 66952722ba no message 2018-01-17 19:30:09 +02:00
Diamantis Tziotzios 18cbd7468c Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts
2018-01-17 17:19:02 +02:00
Diamantis Tziotzios 05cbadb17b no message 2018-01-17 17:17:16 +02:00
annabakouli 39acf89bb4 no message 2018-01-17 17:06:35 +02:00
annabakouli 730db6655d no message 2018-01-17 14:20:48 +02:00