Commit Graph

388 Commits

Author SHA1 Message Date
Nikolaos Laskaris 722cd8b482 Merge branch 'Development' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-11-27 18:34:21 +02:00
Nikolaos Laskaris 8ab9dedec1 Minor ui changes 2017-11-27 18:34:11 +02:00
annabakouli 86c988c840 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/index.html
2017-11-27 15:45:04 +02:00
annabakouli 95b937cfcc no message 2017-11-27 15:40:16 +02:00
annampak a583a5fdde Dataset Profile Form 2017-11-27 15:35:00 +02:00
Nikolaos Laskaris 01fb9bfcc4 minor edits 2017-11-27 14:03:43 +02:00
Nikolaos Laskaris 8f6a4f0ba8 Merge branch 'Development' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-11-27 12:52:59 +02:00
Nikolaos Laskaris 70d5d72699 altered the lifecycle of the user login 2017-11-27 12:52:52 +02:00
Nikolaos Laskaris 4cbaec3667 altered the lifecycle of the user login 2017-11-27 12:51:20 +02:00
Nikolaos Laskaris f28beeda69 Merge branch 'Development' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-11-24 18:23:31 +02:00
Nikolaos Laskaris d4f7506511 changes on dmp-details and project-details 2017-11-24 18:22:52 +02:00
Nikolaos Laskaris fc1c6b90d0 changes on dmp-details and project-details 2017-11-24 18:21:08 +02:00
Nikolaos Laskaris a6b272806b fixed navigation 2017-11-24 10:39:24 +02:00
Nikolaos Laskaris c0ec59681d -- 2017-11-23 15:57:47 +02:00
Nikolaos Laskaris 123660f250 cherry pick from master 2017-11-23 15:04:53 +02:00
annabakouli 2c47630087 fixed missing files error 2017-11-23 13:26:22 +02:00
annabakouli a90c4d7561 refactoring implementation to support composite fields 2017-11-23 12:40:02 +02:00
Nikolaos Laskaris 7a35eafab8 removed app.component.spec.ts 2017-11-23 11:31:44 +02:00
Nikolaos Laskaris d4198d1753 -- 2017-11-23 11:22:31 +02:00
Nikolaos Laskaris 5db9b577fb minor changes 2017-11-22 19:33:29 +02:00
Nikolaos Laskaris eedc7b735b - 2017-11-22 16:27:57 +02:00
Nikolaos Laskaris 4bd813787e - 2017-11-22 15:08:13 +02:00
Nikolaos Laskaris c50607a7df - 2017-11-22 14:48:40 +02:00
Nikolaos Laskaris 0d6a0f06b0 -- 2017-11-22 14:25:01 +02:00
Nikolaos Laskaris ae461a4362 minor edit on breadcrumb 2017-11-22 12:55:40 +02:00
Nikolaos Laskaris b48a4b6264 Merge branch 'master' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot 2017-11-22 12:24:48 +02:00
Nikolaos Laskaris 8738e53d50 -- 2017-11-22 12:14:10 +02:00
Nikolaos Laskaris 2348199dce Added a max-results limit on external repositories queries 2017-11-22 11:50:47 +02:00
Nikolaos Laskaris e0a3f88279 Caching enabled 2017-11-22 10:57:51 +02:00
Nikolaos Laskaris 7e4a40983e Merge branch 'master' of git@gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot.git 2017-11-21 18:29:46 +02:00
Nikolaos Laskaris 0a797d2bb7 Reformed eestore fetching mechanism. Cache is also under consideration 2017-11-21 18:29:16 +02:00
Nikolaos Laskaris 2390cf2760 Merge branch 'master' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot 2017-11-21 12:56:26 +02:00
Ιωάννης Καλύβας 855db092cc Merge branch 'master' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot 2017-11-20 19:04:10 +02:00
Ιωάννης Καλύβας 53280ac7a7 fixed redirect to homepage after refresh 2017-11-20 19:03:34 +02:00
Nikolaos Laskaris a796067316 Added proxy config file 2017-11-20 19:01:19 +02:00
Nikolaos Laskaris 03b5b651e7 -- 2017-11-20 12:31:30 +02:00
Nikolaos Laskaris 8b5704b320 -- 2017-11-20 12:29:42 +02:00
Nikolaos Laskaris 4d809859c8 -- 2017-11-20 12:06:36 +02:00
Nikolaos Laskaris 023756c29d Merge branch 'master' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot 2017-11-20 11:57:34 +02:00
Nikolaos Laskaris 61fe15c8e1 - 2017-11-20 11:57:19 +02:00
annampak bee5649a75 Merge branch 'master' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot 2017-11-20 11:45:13 +02:00
Nikolaos Laskaris d9a791223d -- 2017-11-20 11:10:17 +02:00
annampak ba4b885787 Merge branch 'master' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot 2017-11-20 10:46:27 +02:00
annampak 8b59910404 get composite field 2017-11-20 10:46:09 +02:00
satyr 022768818d Merge branch 'master' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot.git 2017-11-17 21:03:37 +02:00
satyr cc3f70a62e - 2017-11-17 21:03:17 +02:00
satyr 0396aebaeb - 2017-11-17 12:32:52 +02:00
satyr 619d65588c minor changes 2017-11-17 11:47:32 +02:00
satyr 740845349e Merge branch 'master' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot.git 2017-11-17 03:17:09 +02:00
satyr e25964ba29 - 2017-11-17 03:16:09 +02:00