Commit Graph

613 Commits

Author SHA1 Message Date
annabakouli 39acf89bb4 no message 2018-01-17 17:06:35 +02:00
annabakouli c8caa8d50a no message 2018-01-17 14:03:51 +02:00
Diamantis Tziotzios a6e79e3551 no message 2018-01-17 13:57:41 +02:00
Diamantis Tziotzios eab18999ec no message 2018-01-17 12:11:58 +02:00
annampak 694807623b Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-12 18:57:57 +02:00
annampak 3f99bc86b2 no message 2018-01-12 18:57:01 +02:00
annabakouli cb2d276369 no message 2018-01-12 18:32:47 +02:00
annabakouli 81598f35e0 no message 2018-01-12 12:17:37 +02:00
annabakouli e4276815a9 no message 2018-01-12 11:38:34 +02:00
annabakouli 556b1706d6 no message 2018-01-12 11:00:26 +02:00
annabakouli b72ed6eae9 no message 2018-01-12 10:14:28 +02:00
annampak d617ad0bb1 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-11 18:29:23 +02:00
annampak ffc59e912e dynamic comment field 2018-01-11 18:28:34 +02:00
annabakouli d16df93e9f no message 2018-01-11 18:25:41 +02:00
annabakouli c277ea3095 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-11 18:19:32 +02:00
annabakouli 9b3f58f31a no message 2018-01-11 18:19:15 +02:00
annampak d621ef687d progress bar, comment field 2018-01-11 18:14:23 +02:00
annampak 91eecde080 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-11 13:15:29 +02:00
annampak 2bc57251e0 no message 2018-01-11 13:15:15 +02:00
annabakouli f34b39d4c1 no message 2018-01-11 13:13:01 +02:00
annabakouli 60b12fe501 no message 2018-01-10 18:05:23 +02:00
annampak e4db152669 alternate row 2018-01-10 14:21:18 +02:00
annampak 9789ebe3eb ui enhancements 2018-01-10 14:09:42 +02:00
annampak 05dab7f674 progress bar, change server url 2018-01-10 10:17:22 +02:00
annampak fa10688e98 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-09 16:26:48 +02:00
annampak 586f075d1c save dynamic form - create new form bug -> fixed 2018-01-09 16:26:27 +02:00
annabakouli 4eff328ebb no message 2018-01-09 13:31:01 +02:00
annampak 997d4b61da no message 2018-01-08 18:25:08 +02:00
annabakouli abc114b8ab no message 2018-01-08 17:15:45 +02:00
annabakouli 37ae617dfa no message 2018-01-08 16:57:21 +02:00
annampak 0bb338e468 no message 2018-01-08 16:47:08 +02:00
annampak b75bb3367e Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-08 13:51:13 +02:00
annampak cb6d46256c required validation 2018-01-08 13:50:43 +02:00
annabakouli a6e2dd60b4 no message 2018-01-08 13:44:48 +02:00
annampak 693dfc5bb0 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-05 19:02:35 +02:00
annampak dcf0c5ca87 comment field 2018-01-05 19:02:26 +02:00
annabakouli 9da5a8a17b no message 2018-01-05 17:40:19 +02:00
annampak 067e0528dc Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-05 09:49:35 +02:00
annampak 3faa7c29cb data label in field, description, extended description in datasetfield 2018-01-05 09:49:12 +02:00
annabakouli 2d2d718a3a no message 2018-01-05 09:47:52 +02:00
annabakouli 3f5a627d18 no message 2018-01-03 18:36:31 +02:00
annampak 67aa17324c Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-03 13:36:38 +02:00
annampak b844b54b94 chnage on section model 2018-01-03 13:36:28 +02:00
annabakouli e47d488cac no message 2018-01-03 12:44:54 +02:00
annampak 391fd20baf Form with material design 2017-12-28 18:32:28 +02:00
annampak e7ccb8c1d2 bootstap is replaced with material 2017-12-22 18:37:43 +02:00
annabakouli 9af2be155b no message 2017-12-22 16:30:15 +02:00
annampak 5a79779335 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-22 15:46:45 +02:00
annampak bc4e033247 replace ng prime with material 2017-12-22 15:46:36 +02:00
annabakouli 70c2ad9bef no message 2017-12-22 15:42:47 +02:00
annabakouli 62a7c1fad3 no message 2017-12-22 10:31:05 +02:00
annabakouli bd1bc36085 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-21 12:38:30 +02:00
annabakouli b722e5d886 no message 2017-12-21 12:38:18 +02:00
Diamantis Tziotzios 5e4a31748e no message 2017-12-21 12:12:44 +02:00
Diamantis Tziotzios cfd2188a47 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-21 11:46:20 +02:00
Diamantis Tziotzios 1ae1d7cc9f no message 2017-12-21 11:46:11 +02:00
annabakouli 173345ed17 no message 2017-12-21 11:44:57 +02:00
Diamantis Tziotzios ddd25c4e84 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-21 11:39:22 +02:00
Diamantis Tziotzios 5b28cc8032 no message 2017-12-21 11:39:17 +02:00
annabakouli 57f7b672aa no message 2017-12-21 11:26:11 +02:00
Diamantis Tziotzios 2af51a18d2 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-21 11:23:55 +02:00
Diamantis Tziotzios 1ae37dd3ab no message 2017-12-21 11:23:38 +02:00
annampak fbf788781d Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-21 11:16:57 +02:00
annampak a6ee53b6a4 dataset profile in dmp editor 2017-12-21 11:16:46 +02:00
Diamantis Tziotzios 9ed17168db no message 2017-12-21 10:54:49 +02:00
annampak cc539abbc5 no message 2017-12-20 18:54:48 +02:00
annampak f530a2b862 dmp editor profile autocomplete field 2017-12-20 18:50:16 +02:00
Diamantis Tziotzios b1e4787a92 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-20 17:15:39 +02:00
Diamantis Tziotzios d7658687ba no message 2017-12-20 17:15:27 +02:00
annabakouli 06f1086ceb no message 2017-12-20 16:52:09 +02:00
annampak d05b2ba5e2 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-20 16:11:53 +02:00
annampak 5b4d345483 homepage minor changes 2017-12-20 16:11:41 +02:00
Diamantis Tziotzios 91500c6061 Merge branches 'Development' and 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-20 15:34:40 +02:00
Diamantis Tziotzios 7ac0cde7c1 no message 2017-12-20 15:34:32 +02:00
annampak 013e0916f5 dataset style 2017-12-20 14:23:44 +02:00
Diamantis Tziotzios 5d00d133c4 no message 2017-12-20 10:17:13 +02:00
Diamantis Tziotzios 48539aac29 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-frontend/src/app/app.module.ts
2017-12-19 19:36:11 +02:00
Diamantis Tziotzios ad4af5aa1f cleanup 2017-12-19 19:34:00 +02:00
annampak c981cc28d9 dataset editor 2017-12-19 18:50:00 +02:00
annampak e0426f1193 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-frontend/src/app/app-routing.module.ts
#	dmp-frontend/src/app/app.module.ts
2017-12-19 18:32:35 +02:00
annampak 44a53be5b1 dataset listing fields model 2017-12-19 18:26:29 +02:00
Diamantis Tziotzios 74f11f0f1b no message 2017-12-19 17:59:34 +02:00
annampak 3a0100da05 dataset editor - data table 2017-12-19 17:38:28 +02:00
Diamantis Tziotzios b58e059f73 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-19 16:27:26 +02:00
annabakouli 65dc958331 no message 2017-12-19 16:09:49 +02:00
Diamantis Tziotzios bac6d12b42 no message 2017-12-19 15:57:07 +02:00
annampak b9e1270a1b Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-19 14:47:22 +02:00
annampak b3cbd1addf dataset editor 2017-12-19 14:47:08 +02:00
Diamantis Tziotzios 9b62f914b6 no message 2017-12-19 14:06:52 +02:00
Diamantis Tziotzios 24b2dfabdc no message 2017-12-19 13:45:56 +02:00
Diamantis Tziotzios 8bb591245a no message 2017-12-19 12:33:47 +02:00
Diamantis Tziotzios 84845284f5 Merge branches 'Development' and 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-19 11:54:05 +02:00
Diamantis Tziotzios 72ab2d9513 no message 2017-12-19 11:53:52 +02:00
annabakouli 8bec0a6cf0 no message 2017-12-19 11:02:25 +02:00
annampak 3e5e550cee Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-19 10:40:08 +02:00
annampak 9d8b82aa13 homepage delete whoami 2017-12-19 10:39:21 +02:00
annabakouli 8da309b72d no message 2017-12-19 10:38:47 +02:00
annampak 5012479689 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-19 10:20:43 +02:00
annampak 0018f73fd7 no message 2017-12-19 10:20:35 +02:00
Diamantis Tziotzios b64af052c9 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-19 09:31:12 +02:00
Diamantis Tziotzios 6ffa556aa7 no message 2017-12-19 09:31:02 +02:00
annabakouli c1f2c615af no message 2017-12-18 18:25:08 +02:00
Diamantis Tziotzios 5cc601b0da Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-18 17:53:30 +02:00
Diamantis Tziotzios 1f9d07885f no message 2017-12-18 17:53:17 +02:00
annampak e945cda554 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-18 17:28:16 +02:00
annampak 98c22feba7 dataset criteria 2017-12-18 17:28:09 +02:00
Diamantis Tziotzios 0fdf82728b Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-18 17:15:49 +02:00
Diamantis Tziotzios 072d414038 no message 2017-12-18 17:15:39 +02:00
annampak 8572bd14bd Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-18 17:10:43 +02:00
annampak 2e611befbf dataset criteria --dmp&dataset delete 2017-12-18 17:10:34 +02:00
Diamantis Tziotzios 2352c759ed Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-18 16:58:27 +02:00
Diamantis Tziotzios 5e39e9643d no message 2017-12-18 16:58:13 +02:00
annampak 58ab138fe0 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-18 16:28:24 +02:00
annampak a793e0f365 dataset editor 2017-12-18 16:28:08 +02:00
Diamantis Tziotzios e64e4e50aa Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-frontend/src/assets/lang/en.json
2017-12-18 15:47:46 +02:00
Diamantis Tziotzios 98557be4d9 no message 2017-12-18 15:45:36 +02:00
annampak 11fa25da40 dataset criteria & payload json object 2017-12-18 15:24:10 +02:00
annampak fa8881946e Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-18 13:27:32 +02:00
annampak 934dcb8130 dataset criteria 2017-12-18 13:26:13 +02:00
Diamantis Tziotzios bf6247a091 no message 2017-12-18 13:24:12 +02:00
Diamantis Tziotzios 4852dcf0cf Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-18 12:01:46 +02:00
Diamantis Tziotzios 8ff927a4a7 no message 2017-12-18 12:01:22 +02:00
annampak 6c669a1571 dataset table 2017-12-15 17:33:18 +02:00
annampak d134efcb55 dashborad total counts from server 2017-12-15 13:52:11 +02:00
annabakouli 66447e29e9 no message 2017-12-15 12:26:25 +02:00
Diamantis Tziotzios f08fcda7f5 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-frontend/src/app/app.module.ts
#	dmp-frontend/src/app/homepage/homepage.component.html
2017-12-14 19:15:24 +02:00
Diamantis Tziotzios 8132fbc161 no message 2017-12-14 19:13:28 +02:00
annampak 878db46b0e dashboard 2017-12-14 18:43:57 +02:00
Diamantis Tziotzios 29245df4f7 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-14 15:11:04 +02:00
Diamantis Tziotzios c3ef5dfe63 projects material geid 2017-12-14 15:10:56 +02:00
annabakouli 63fe32fbaf no message 2017-12-14 14:04:33 +02:00
annampak 682a823f26 no message 2017-12-14 13:58:59 +02:00
annampak 3ab46d7b53 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-14 12:47:39 +02:00
annampak b788dee254 no message 2017-12-14 12:47:21 +02:00
Diamantis Tziotzios fbc76556f7 material addition 2017-12-14 12:41:26 +02:00
annampak 3ad5214592 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-13 14:57:44 +02:00
annampak d4cf2294b2 multiplicity admin/front-end 2017-12-13 14:57:19 +02:00
annabakouli 621b72bd9c no message 2017-12-13 14:55:12 +02:00
annabakouli 6c2c0a8700 no message 2017-12-13 14:01:43 +02:00
annampak b9fa3d1dac multiplicity 2017-12-13 11:26:02 +02:00
annampak 30d136e634 comment multiplicity 2017-12-12 17:23:58 +02:00
annabakouli 62b3fc2185 fixed progress bar not starting onInit 2017-12-12 14:12:13 +02:00
annabakouli bbb046656c no message 2017-12-12 14:08:51 +02:00
krommydas kyriakos b00ef417af Add small delay before scrolling to url hash item.
Override ngPrime progress bar label styling, by enforcing the display of 0 value
2017-12-12 13:33:14 +02:00
Diamantis Tziotzios f3ac0b6e82 no message 2017-12-12 10:07:33 +02:00
annampak 6f75b9fc00 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-11 18:57:43 +02:00
annampak 22f621383b default value in field model 2017-12-11 18:57:35 +02:00
krommydas kyriakos f47c2c5925 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-11 18:39:44 +02:00
krommydas kyriakos 03aa2e6a8c final page handling changes 2017-12-11 18:39:32 +02:00
Diamantis Tziotzios 67007c8d3d no message 2017-12-11 17:35:51 +02:00
krommydas kyriakos 8d6df43faa Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-11 16:22:02 +02:00
krommydas kyriakos ed88e8a125 Changes to page handling 2017-12-11 16:21:49 +02:00
Diamantis Tziotzios cde1596c35 no message 2017-12-11 15:47:52 +02:00
annabakouli 5fdc5b6720 add loader when opening description for dataset and dmp 2017-12-11 13:20:48 +02:00
annabakouli e069a14b55 changed fetch strategies for queries to improve performance on some queries 2017-12-11 13:05:30 +02:00
Diamantis Tziotzios d0e123c350 no message 2017-12-11 12:40:21 +02:00
Diamantis Tziotzios 4e61f16996 no message 2017-12-11 12:36:29 +02:00
annabakouli 265d4cf602 referential integrity update 2017-12-11 11:48:18 +02:00
Diamantis Tziotzios 1cc7933693 no message 2017-12-11 11:20:27 +02:00
krommydas kyriakos 9e0d989b67 Small fix 2017-12-11 10:50:27 +02:00
Diamantis Tziotzios 3acba4ceb6 no message 2017-12-11 10:40:11 +02:00
Diamantis Tziotzios 38241fe955 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-frontend/src/app/form/dynamic-form.component.html
2017-12-11 10:12:12 +02:00
Diamantis Tziotzios ccbd1644b4 no message 2017-12-11 10:10:54 +02:00
ikalyvas 7b4bea0710 referential integrity for researchers and organizations 2017-12-10 00:31:07 +02:00
krommydas kyriakos 2f86c38e21 Discard pagination service. Listen to url changes on page param instead. 2017-12-08 19:12:31 +02:00
annabakouli 84fd2a5704 persist referential integrity 2017-12-08 16:52:12 +02:00
Diamantis Tziotzios f7c97f87cf researchers and organisations added to create DMP ui 2017-12-08 12:26:52 +02:00
annabakouli 1f1a0e62ae no message 2017-12-08 12:19:50 +02:00
annabakouli e4ed1bbaa6 no message 2017-12-08 12:03:41 +02:00
Diamantis Tziotzios 028410c128 services, repos, registries added to dataset creation 2017-12-08 11:51:39 +02:00
Diamantis Tziotzios daa0853dbc no message 2017-12-07 18:34:48 +02:00
annabakouli 21df6ccdd1 no message 2017-12-07 17:15:28 +02:00
krommydas kyriakos 1dc50e43b9 Add decimals precision for progress bar 2017-12-07 16:00:46 +02:00
annabakouli b8a3917522 no message 2017-12-07 15:36:12 +02:00
annabakouli 73c38f3ff3 addition of progress bar 2017-12-07 11:26:06 +02:00
annabakouli a9c05943e0 no message 2017-12-06 18:45:54 +02:00
Diamantis Tziotzios fe6ab0d125 no message 2017-12-06 15:06:07 +02:00
annabakouli cc822f0797 no message 2017-12-06 15:00:04 +02:00
Diamantis Tziotzios 13cb173b7c Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-06 14:54:01 +02:00
Diamantis Tziotzios 5fc7a67eb7 no message 2017-12-06 14:53:48 +02:00
annabakouli 5509307388 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-06 14:49:01 +02:00
annabakouli 3ced6b5236 no message 2017-12-06 14:48:29 +02:00
Diamantis Tziotzios e8d9190648 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.html
2017-12-06 14:45:35 +02:00
Diamantis Tziotzios a7b2188a90 no message 2017-12-06 14:44:40 +02:00
annabakouli e83c54f37f no message 2017-12-06 14:42:28 +02:00
annabakouli 902116e039 checkbox with label 2017-12-06 14:16:31 +02:00
Diamantis Tziotzios 07a4433f34 field ui changes 2017-12-06 13:39:49 +02:00
annabakouli be2e992584 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-06 12:41:48 +02:00
annabakouli 584a252119 no message 2017-12-06 12:41:11 +02:00
Diamantis Tziotzios ae9b12744d Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-06 12:36:02 +02:00
Diamantis Tziotzios 8efe88c5fa more form ui changes 2017-12-06 12:35:50 +02:00
annabakouli bc2ca1764c no message 2017-12-06 11:06:02 +02:00
annabakouli eec410cead no message 2017-12-06 11:04:55 +02:00
annabakouli aa22e27f51 no message 2017-12-06 11:04:04 +02:00
annabakouli 00aeab6490 no message 2017-12-06 10:58:50 +02:00
Diamantis Tziotzios f3d9597a54 ui changes 2017-12-06 10:46:05 +02:00
annabakouli 80115ed3cf table of contents + pagination 2017-12-05 18:56:21 +02:00
annampak 0741504473 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-admin/src/app/services/rest-base.ts
2017-12-01 16:15:36 +02:00
annampak 4cd7d39279 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-admin/src/app/testModel/testModel.ts
2017-12-01 16:14:05 +02:00
annabakouli cdfa350e82 model serialization workflow between admin and user 2017-12-01 16:09:46 +02:00