Commit Graph

83 Commits

Author SHA1 Message Date
Diamantis Tziotzios 9ed17168db no message 2017-12-21 10:54:49 +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
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
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
Diamantis Tziotzios 74f11f0f1b no message 2017-12-19 17:59:34 +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 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 8da309b72d no message 2017-12-19 10:38:47 +02:00
Diamantis Tziotzios 6ffa556aa7 no message 2017-12-19 09:31:02 +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 98c22feba7 dataset criteria 2017-12-18 17:28:09 +02:00
annampak 2e611befbf dataset criteria --dmp&dataset delete 2017-12-18 17:10:34 +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 8ff927a4a7 no message 2017-12-18 12:01:22 +02:00
annampak d134efcb55 dashborad total counts from server 2017-12-15 13:52:11 +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 c3ef5dfe63 projects material geid 2017-12-14 15:10:56 +02:00
Diamantis Tziotzios fbc76556f7 material addition 2017-12-14 12:41:26 +02:00