Commit Graph

485 Commits

Author SHA1 Message Date
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
ikalyvas 0120818f36 no message 2018-01-02 10:36:40 +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
annabakouli 7e9b995cca project dmps pagination 2017-12-14 19:07:09 +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