Commit Graph

4771 Commits

Author SHA1 Message Date
Diamantis Tziotzios a5099d8d5d Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
#	dmp-backend/Dockerfile
#	dmp-backend/Dockerfile.CI
2024-04-08 13:34:36 +03:00
Diamantis Tziotzios 03067fe6f6 Dockerfile changes 2024-04-08 13:31:46 +03:00
Alexandros Mandilaras e1b09c9250 no message 2024-04-08 12:58:55 +03:00
Alexandros Mandilaras a11e2c300d dockerfile fixes 2024-04-08 12:43:07 +03:00
Alexandros Mandilaras c898227035 revert that also 2024-04-08 12:23:19 +03:00
Alexandros Mandilaras 40d9850727 try different groupID 2024-04-08 12:14:28 +03:00
Alexandros Mandilaras c63f8cf928 remove unused profile in annotation-service 2024-04-08 11:36:34 +03:00
Efstratios Giannopoulos 399e8e2f2a Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-04-08 11:22:15 +03:00
Efstratios Giannopoulos abc60aa11e bug fix 2024-04-08 11:21:51 +03:00
Alexandros Mandilaras ffd521f4dc remove packaging type from core 2024-04-08 11:21:49 +03:00
Sofia Papacharalampous 325356a2ae config 2024-04-08 11:02:44 +03:00
Sofia Papacharalampous 8d2d936a73 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-04-08 11:00:55 +03:00
Sofia Papacharalampous 6013cb5225 dmp editor > select default blueprint 2024-04-08 10:59:26 +03:00
Alexandros Mandilaras bdfcb8cdf6 update Dockerfiles 2024-04-08 10:59:10 +03:00
Alexandros Mandilaras 79431f0865 revert devProfulURL change 2024-04-08 10:52:22 +03:00
amentis f2e6189fac Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring 2024-04-08 10:48:36 +03:00
Alexandros Mandilaras 9ce9632c37 remove devProfileURL from dockerfile 2024-04-08 10:47:48 +03:00
amentis 51d941b0f7 Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring 2024-04-08 10:46:41 +03:00
amentis e89bfdf0f4 remove description template section multiplicity property 2024-04-08 10:45:32 +03:00
Alexandros Mandilaras c1a241e4a8 try not use revision variable 2024-04-08 10:34:21 +03:00
Alexandros Mandilaras c0ac0bb728 correct path 2024-04-08 10:29:05 +03:00
Alexandros Mandilaras ef5125bb04 rm -devel configs 2024-04-08 10:21:56 +03:00
Alexandros Mandilaras 8833905325 Dockerfile updates 2024-04-08 10:09:19 +03:00
Alexandros Mandilaras 565e8a3b1e uncomment the groupID 2024-04-08 09:52:49 +03:00
Alexandros Mandilaras b676bafdab try more fixes 2024-04-08 09:50:16 +03:00
Alexandros Mandilaras 6ffc0a0a10 add groupID when building backend core 2024-04-08 09:39:17 +03:00
Alexandros Mandilaras 83855540d2 revert that change 2024-04-08 09:35:31 +03:00
Alexandros Mandilaras 3e8cb9b17e try possible fix for backend web build 2024-04-08 09:25:06 +03:00
Efstratios Giannopoulos a4252a6157 updateDescriptionTemplate backend 2024-04-05 18:33:23 +03:00
Efstratios Giannopoulos c8809ee457 updateDescriptionTemplate backend 2024-04-05 18:32:49 +03:00
Efstratios Giannopoulos 17b787c142 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-04-05 18:04:20 +03:00
Efstratios Giannopoulos 45e3426969 fix delete callback 2024-04-05 18:03:26 +03:00
Alexandros Mandilaras ad069b5568 remove duplicate properties 2024-04-05 17:55:19 +03:00
Alexandros Mandilaras 1f142c672f possible fixes for Docker build 2024-04-05 17:52:20 +03:00
Efstratios Giannopoulos 7ebe22a45f Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
#	dmp-frontend/src/app/ui/description/listing/description-listing.component.ts
#	dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
2024-04-05 17:50:07 +03:00
Efstratios Giannopoulos 5176916ce7 add belongsToCurrentTenant to ui 2024-04-05 17:49:20 +03:00
amentis 4503bc0bcf description field fixes 2024-04-05 17:25:25 +03:00
Sofia Papacharalampous 405bf0c9b2 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-04-05 17:18:17 +03:00
Sofia Papacharalampous 9ba20bdd17 added finalized date on dmp and description listing screens 2024-04-05 17:17:33 +03:00
Alexandros Mandilaras 328ac3b1f6 Dockerfile changes 2024-04-05 16:57:00 +03:00
Efstratios Giannopoulos 4963d8ffc3 add belongsToCurrentTenant to ui 2024-04-05 15:20:03 +03:00
Efstratios Giannopoulos 6a89feb31b Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-04-05 14:13:42 +03:00
Efstratios Giannopoulos 028b1e0c94 description template new version tenant validation 2024-04-05 14:13:30 +03:00
Efstratios Giannopoulos efb816c627 pom changes 2024-04-05 14:12:15 +03:00
Alexandros Mandilaras 2cc9d2bee0 revert 2024-04-05 14:11:15 +03:00
Alexandros Mandilaras 9f99f622ef try remove revision 2024-04-05 13:35:13 +03:00
Alexandros Mandilaras 42af117718 update Dockerfile 2024-04-05 13:32:07 +03:00
amentis b6138da7ab multiplicity on description template fix bug 2024-04-05 13:16:22 +03:00
Efstratios Giannopoulos bf08b6abb7 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-04-05 12:43:48 +03:00
Efstratios Giannopoulos e61f06c192 use ilike 2024-04-05 12:43:33 +03:00