MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity
816 Commits 37 Branches 247 Tags 110 MiB
Commit Graph

816 Commits

Author SHA1 Message Date
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
annabakouli 703d0b84c3 no message 2017-12-19 18:22:30 +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 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