Commit Graph

642 Commits

Author SHA1 Message Date
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 176f5b3004 no message 2017-12-18 18:26:38 +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
ikalyvas f3fdfa1dbf criteria application for queries with pagination 2017-12-17 23:34:24 +02:00
annabakouli b0923b87d9 no message 2017-12-15 18:57:41 +02:00
annampak aab679df29 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-15 17:33:29 +02:00
annampak 6c669a1571 dataset table 2017-12-15 17:33:18 +02:00
annabakouli 919b60b733 dataset getpaged getsingle 2017-12-15 14:25:21 +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
annabakouli 9a724100d0 no message 2017-12-15 12:05:51 +02:00
ikalyvas 5f2f66bd71 migrating to spring boot 2017-12-15 01:01:26 +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
Diamantis Tziotzios fbc76556f7 material addition 2017-12-14 12:41:26 +02:00
annabakouli 24588ef422 no message 2017-12-13 18:58:51 +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