Commit Graph

560 Commits

Author SHA1 Message Date
Efstratios Giannopoulos 6a0d1a7c8b refactor description template xml 2024-01-31 14:33:24 +02:00
Diamantis Tziotzios 2ba9e146e5 more ui changes 2024-01-31 12:53:30 +02:00
Diamantis Tziotzios 078ca9e0cb minor ui fixes 2024-01-31 12:30:21 +02:00
amentis 285978fb58 add contacts dmp editor ui 2024-01-31 11:27:36 +02:00
Diamantis Tziotzios 59c425a240 no message 2024-01-31 10:44:48 +02:00
Diamantis Tziotzios 5377b1db18 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-01-30 19:28:09 +02:00
Diamantis Tziotzios f296bc44f9 description template frontend changes 2024-01-30 19:27:55 +02:00
Efstratios Giannopoulos 4d1d712215 xml serializer changes 2024-01-30 18:34:22 +02:00
Efstratios Giannopoulos 16222fc02c bug fix 2024-01-30 17:23:18 +02:00
Efstratios Giannopoulos 268b82eb49 update description template xml 2024-01-30 16:31:03 +02:00
amentis 7d66c1e857 fix dmp contact builders 2024-01-30 15:24:15 +02:00
Efstratios Giannopoulos 2f48b3bae2 remove old code 2024-01-29 18:26:58 +02:00
Efstratios Giannopoulos aebc6056f9 UserRemovalIntegrationEvent changes 2024-01-29 18:10:55 +02:00
Thomas Georgios Giannos 80a3aa5616 Setting outbox calls on user updates / creations, removing not needed inbox events 2024-01-29 16:51:29 +02:00
Diamantis Tziotzios 4542189a26 autocomplete changes 2024-01-29 14:39:20 +02:00
amentis 8fb3556acb dmp blueprint editor fixes 2024-01-29 13:13:30 +02:00
amentis ea6e2765ea add integration event component names 2024-01-29 09:37:25 +02:00
Efstratios Giannopoulos d89d8d4aa8 DescriptionTemplate version status fixes 2024-01-26 18:18:05 +02:00
Thomas Georgios Giannos a55d7c3692 Adding outbox events for users on the main app 2024-01-26 17:42:45 +02:00
George Kalampokis ac932ffb05 Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring 2024-01-26 12:55:08 +02:00
George Kalampokis c9121ebb1a Fix error if one of the file transformer clients doesn't respond 2024-01-26 12:54:55 +02:00
Efstratios Giannopoulos 2726d232dd upgrade blueprint xml 2024-01-26 12:42:46 +02:00
Efstratios Giannopoulos c05ccef28e change blueprint to user description template group id 2024-01-26 11:41:20 +02:00
Diamantis Tziotzios ae543324a4 dmp blueprint editor changes 2024-01-25 18:08:47 +02:00
amentis b6a85e151d add xml type to dmp blueprint entity 2024-01-25 15:50:52 +02:00
amentis f8fa4e519b fix dmp blueprint system fields ui 2024-01-25 15:49:34 +02:00
amentis 8828be7dfa fix dmp blueprint create and blueprint description template validators 2024-01-24 17:50:34 +02:00
amentis 0faa5f731a remove notification from main app 2024-01-24 14:54:33 +02:00
amentis d0faa6713d update validators with list null or empty 2024-01-24 13:54:26 +02:00
Thomas Georgios Giannos 6502221343 Setting userId from userScope on NotifyEvent in contact support service 2024-01-23 11:53:49 +02:00
Diamantis Tziotzios ef02fa806e various fixes 2024-01-19 18:28:53 +02:00
amentis d60ecc4f1c fix update form validators 2024-01-19 16:23:34 +02:00
Thomas Georgios Giannos 53062a879f Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-01-19 15:12:44 +02:00
Thomas Georgios Giannos a56a9075b1 Fixes on notification service and core 2024-01-19 15:12:33 +02:00
Efstratios Giannopoulos 698c27747d change DmpPropertiesPersist to use map 2024-01-19 15:12:03 +02:00
Diamantis Tziotzios d4739ed1d0 small validation fix 2024-01-19 15:00:46 +02:00
Efstratios Giannopoulos 409b96f518 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-01-19 14:55:38 +02:00
Efstratios Giannopoulos c94d57f3a0 upgrade validations 2024-01-19 14:52:39 +02:00
Diamantis Tziotzios c4dac0e7d0 various ui fixes 2024-01-19 14:28:31 +02:00
amentis 9356352e7d fix reference type editor validators 2024-01-18 14:40:51 +02:00
Diamantis Tziotzios 5e32f1e74d Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-01-18 14:23:46 +02:00
Diamantis Tziotzios 7ad8077bc8 changes on the dmp editor frontend 2024-01-18 14:23:20 +02:00
George Kalampokis 3f436846f6 Fix some merge issues 2024-01-18 10:28:16 +02:00
George Kalampokis e39d8d25b6 Merge branch 'dmp-refactoring-file-transformer-builder' into dmp-refactoring 2024-01-18 10:11:29 +02:00
George Kalampokis 3749365e87 Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring 2024-01-18 10:10:23 +02:00
George Kalampokis cd696bf55a Yet another fix and set proper file transformer base version 2024-01-18 10:08:46 +02:00
amentis 3bd60509e7 fix persist validators 2024-01-17 18:20:39 +02:00
George Kalampokis aa75b3e3ab Update file transformer Service and add xml transformer config 2024-01-17 14:31:31 +02:00
Efstratios Giannopoulos 70c94c5bdc update validator package 2024-01-17 12:04:33 +02:00
Efstratios Giannopoulos b76a158824 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-01-17 11:20:33 +02:00
Efstratios Giannopoulos 200948d962 update validator package 2024-01-17 11:20:02 +02:00
Thomas Georgios Giannos aab7571763 Notification service upgrade to Spring Boot 3, fixing startup and dependency issues 2024-01-16 19:13:07 +02:00
George Kalampokis 7b963858f2 Finalize File Transformer Builder 2024-01-16 18:07:13 +02:00
Efstratios Giannopoulos b04c0aebab confirmRemoveCredential changes 2024-01-16 12:56:48 +02:00
Efstratios Giannopoulos 37aa6061a4 add locale config 2024-01-16 12:51:38 +02:00
Efstratios Giannopoulos 1828e28485 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-01-16 12:28:36 +02:00
Efstratios Giannopoulos d1cad30fcb add CredentialData 2024-01-16 12:26:29 +02:00
amentis 412c778d8c add backend validation in language, references, tenant,supportive material editor forms. 2024-01-16 11:55:46 +02:00
Diamantis Tziotzios d760209d20 more dmp editor frontend changes 2024-01-15 18:47:34 +02:00
Efstratios Giannopoulos 04381aec20 user credential changes 2024-01-15 18:03:12 +02:00
Efstratios Giannopoulos f6b7b6e00d add dmp properties models 2024-01-15 15:06:50 +02:00
Efstratios Giannopoulos 9b079e4d4d old code cleanup 2024-01-15 14:16:20 +02:00
Efstratios Giannopoulos 4da8c2a6a9 merge remove credential changes 2024-01-15 13:57:33 +02:00
Efstratios Giannopoulos 141ef488e5 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-01-12 15:00:58 +02:00
Efstratios Giannopoulos 4b9b5cc056 dmp reference changes 2024-01-12 15:00:34 +02:00
Thomas Georgios Giannos 93ce7ecd6d Notification service config update 2024-01-12 13:55:50 +02:00
Efstratios Giannopoulos 4d60698327 public contact send changes 2024-01-11 18:23:21 +02:00
George Kalampokis 3d5be3a00a Add more missing field on File Transformer Builder 2024-01-11 18:02:38 +02:00
amentis 17d97bb3b3 add inapp notification events in main app 2024-01-10 17:46:45 +02:00
Efstratios Giannopoulos d0157fa0e5 bug fixes 2024-01-09 18:28:04 +02:00
Efstratios Giannopoulos 59aae92a0e elastic changes 2024-01-09 16:02:12 +02:00
Efstratios Giannopoulos 1f92872158 elastic changes 2024-01-09 14:53:48 +02:00
amentis c36aff22e8 inapp notification changes 2024-01-08 18:29:23 +02:00
George Kalampokis 742fa49a7c Fix File Transformer builder issues and add support for the File Storage Service 2024-01-08 17:54:30 +02:00
Efstratios Giannopoulos 3fc04a1e3a simplify description template fielddata 2024-01-08 16:10:29 +02:00
Efstratios Giannopoulos 371dcd5a61 elastic changes 2024-01-08 13:25:56 +02:00
Efstratios Giannopoulos 614fa9314a prefiling service refactor 2024-01-08 12:58:00 +02:00
Efstratios Giannopoulos 658310d8ce prefiling service refactor 2024-01-05 18:32:24 +02:00
George Kalampokis 71746419fc Add FileTransformer Builders 2024-01-05 18:06:16 +02:00
Thomas Georgios Giannos e8553b1605 Resolving some validations applying based on status 'Finalized' 2024-01-05 17:10:13 +02:00
amentis 34df0b640c fix query available languages by ordinal 2024-01-05 16:27:37 +02:00
amentis a5f88db680 fix dmp invitation dialog 2024-01-05 15:33:27 +02:00
Thomas Georgios Giannos 9dd0405dc8 Resolving validation service implementation not available after cleanup of old code 2024-01-05 15:18:28 +02:00
Thomas Georgios Giannos b7d1424e0c Code cleanup 2024-01-05 14:02:22 +02:00
Thomas Georgios Giannos 897d099c2c Resolving issues with validators, removing old validation methods 2024-01-05 13:32:38 +02:00
amentis 7ba374d844 small fix 2024-01-05 11:41:57 +02:00
Efstratios Giannopoulos c9640bcb54 add dmp associated user query 2024-01-05 11:05:40 +02:00
Efstratios Giannopoulos f8e1b4ab8b add contact support 2024-01-04 16:25:07 +02:00
Thomas Georgios Giannos 0e1a9c88b1 Implementing validators for Deposit request models (completed) 2024-01-04 13:31:14 +02:00
Efstratios Giannopoulos c056e04a89 remove old notification 2024-01-04 13:23:16 +02:00
Efstratios Giannopoulos a53396e38a remove content 2024-01-04 13:19:00 +02:00
Efstratios Giannopoulos 26ab1fb612 remove old notification 2024-01-04 13:11:13 +02:00
Efstratios Giannopoulos 5b18809da0 remove old lock 2024-01-04 13:05:06 +02:00
Efstratios Giannopoulos 73b0272672 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-01-04 12:56:23 +02:00
Efstratios Giannopoulos f253fd965c remove old refence classes 2024-01-04 12:55:42 +02:00
Thomas Georgios Giannos 29022ee1cd Implementing validators for User persist models (completed) 2024-01-04 12:39:31 +02:00
Thomas Georgios Giannos 18a4684859 Implementing validators for Tenant and other persist models (completed) 2024-01-04 11:51:56 +02:00
Efstratios Giannopoulos ccd7d069cb reference refactor 2024-01-04 11:23:13 +02:00
Thomas Georgios Giannos eb2b5d4df3 Implementing validators for Reference persist models (completed) 2024-01-04 10:15:29 +02:00
Efstratios Giannopoulos 503fe2c3dc Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-01-03 18:22:41 +02:00
Efstratios Giannopoulos a4ced2be21 reference refactor 2024-01-03 18:22:24 +02:00
Thomas Georgios Giannos c4ec41bec1 Implementing validators for Reference persist models (not completed) 2024-01-03 18:09:14 +02:00
Thomas Georgios Giannos e5410f39fc Implementing validators for Reference persist models (not completed) 2024-01-03 16:45:57 +02:00
Efstratios Giannopoulos b87612c783 code cleanup 2024-01-03 16:21:39 +02:00
Efstratios Giannopoulos 71343c51e5 Add excludedTags, bug fixes 2024-01-03 14:06:26 +02:00
Thomas Georgios Giannos 8d5b3d0426 Implementing validators for Dmp persist models (completed) 2024-01-02 17:39:50 +02:00
Thomas Georgios Giannos 3f554554fd Implementing validators for Dmp blueprint persist models (completed) 2024-01-02 14:10:35 +02:00
Thomas Georgios Giannos 1462b9944d Implementing validators for Description template related persist models (completed) 2024-01-02 11:50:32 +02:00
Diamantis Tziotzios 7b28f499a8 frontend cleanup 2023-12-29 17:04:16 +02:00
Diamantis Tziotzios 244e0e83a2 more frontend changes 2023-12-28 17:18:49 +02:00
Thomas Georgios Giannos 2a6b047327 Implementing validators for Description template related persist models (not completed) 2023-12-22 19:00:53 +02:00
Thomas Georgios Giannos 63ffeabe62 Implementing validators for Description related persist models, action confirmation and dmp clone persist (in progress) 2023-12-21 18:45:49 +02:00
George Kalampokis acc4557836 Update file-transformer-base version 2023-12-20 10:49:42 +02:00
George Kalampokis 3b12e89ac2 Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring 2023-12-19 18:09:15 +02:00
George Kalampokis 8f6d0cc33d Made File export menus dynamic and based on the available file transformers (no POM) 2023-12-19 18:09:09 +02:00
Efstratios Giannopoulos f09e031e0c move old validation logic 2023-12-19 15:46:31 +02:00
Efstratios Giannopoulos 4fa4cdc671 DescriptionTemplateTypePersist remove old validators 2023-12-19 15:11:22 +02:00
Efstratios Giannopoulos 68c56d70a4 new logic of validations 2023-12-19 14:54:17 +02:00
Thomas Georgios Giannos 6e0821f703 Updating file-transformer-base version to 0.0.1 2023-12-19 10:38:29 +02:00
Efstratios Giannopoulos bd64566e8c new validation logic 2023-12-18 18:23:37 +02:00
George Kalampokis f06d3de1ec Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring 2023-12-18 12:57:21 +02:00
George Kalampokis 625a322467 Add File transformer integration 2023-12-18 12:55:19 +02:00
amentis 6a6840fc79 add custom required one field validator 2023-12-18 10:30:37 +02:00
amentis 653991a066 change dmpInvitationExisting User template 2023-12-15 16:06:30 +02:00
Thomas Georgios Giannos a9eb2ff8a7 Resolving migration tool startup issues due to core module changes, change on handling of license json objects 2023-12-15 14:47:54 +02:00
amentis fd1d6c9b1a create dmpInvitationExistingUser notification and small changes 2023-12-15 11:51:08 +02:00
amentis bcd42e7ec1 change exception for confirm notifications requests 2023-12-15 10:15:00 +02:00
amentis 3990be182c add notifications to user,description,description-template 2023-12-14 18:19:43 +02:00
George Kalampokis 0b45dd6981 Refactor index-management (maintance refactor) 2023-12-14 14:34:39 +02:00
amentis e2c352bf00 add action confirmation entity and dmp notifications 2023-12-14 14:02:30 +02:00
Thomas Georgios Giannos e4d2cde296 Migrating licenses from dmps extra properties, while avoiding creating duplicates 2023-12-13 17:35:29 +02:00
Efstratios Giannopoulos 8eda8402ab Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2023-12-13 11:46:02 +02:00
Efstratios Giannopoulos 048980ac39 zenodo model changes 2023-12-13 11:42:59 +02:00
Thomas Georgios Giannos 9f781853a7 Resolving role naming conflicts 2023-12-12 17:51:40 +02:00
Thomas Georgios Giannos 24bfd69e4d Error handling on user role assignment service 2023-12-12 17:04:01 +02:00
amentis f47f9721fe remove mail service 2023-12-12 16:42:11 +02:00
Thomas Georgios Giannos f46543f1a4 Fix on role naming compatibility 2023-12-12 16:32:37 +02:00
Thomas Georgios Giannos b46c4e19e2 Extracting subject id from user credentials for role mapping on Keycloak Api 2023-12-12 16:17:08 +02:00
amentis a94473be49 small change 2023-12-12 11:49:52 +02:00
amentis 86628a59a7 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2023-12-12 10:17:12 +02:00
amentis f6100a8ea2 add inbox, outbox 2023-12-12 10:14:26 +02:00
Thomas Georgios Giannos a42e858f71 Small fix 2023-12-12 09:38:25 +02:00
amentis 28fad3ccc4 remove mail service 2023-12-11 18:47:35 +02:00
Thomas Georgios Giannos e70db447c8 Adding and removing users from Keycloak groups on role assignment 2023-12-11 10:56:40 +02:00
amentis 880e8c5aa8 refactor lock entity 2023-12-08 18:05:48 +02:00
Thomas Georgios Giannos 0c34502f08 Fixing issues on Dataset public Api mappers 2023-12-08 17:21:06 +02:00
Thomas Georgios Giannos 038c78fb04 Configuring groups for user roles 2023-12-08 13:27:04 +02:00
Thomas Georgios Giannos 08a5b49d1d Supporting client roles for users on Keycloak API service 2023-12-08 11:48:32 +02:00
Efstratios Giannopoulos c1b197ea30 Dmp/Description changes 2023-12-06 18:33:01 +02:00
Thomas Georgios Giannos b9eba9edcb Fix on entity doi query 2023-12-06 18:08:15 +02:00
Thomas Georgios Giannos 9ba8751564 Fixing issues in public API mappers 2023-12-06 17:38:03 +02:00
amentis 5825aa642a add tenant users on User model 2023-12-06 17:07:14 +02:00
Thomas Georgios Giannos 37c170ea54 Adding mappers for description definitions to PagedDatasetProfile model 2023-12-06 16:14:07 +02:00
amentis dd7007128b small fix 2023-12-06 16:12:30 +02:00
amentis 908c530922 add tenant to tables 2023-12-06 14:21:25 +02:00
Efstratios Giannopoulos 85bd0de2d5 statistics changes 2023-12-06 14:18:19 +02:00
amentis bee0e9f152 fix update_notification script 2023-12-06 13:08:49 +02:00
Efstratios Giannopoulos c286838a30 add DashboardStatistics 2023-12-05 18:13:40 +02:00
Efstratios Giannopoulos 2fb99d2fe7 add getMyRecentActivityItems 2023-12-05 16:05:37 +02:00
Efstratios Giannopoulos bc0d39a72f bug fixes 2023-12-05 11:32:17 +02:00
Diamantis Tziotzios 46e56111f0 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2023-12-04 19:38:52 +02:00
Diamantis Tziotzios ad1539af59 dmp overview page refactor 2023-12-04 19:37:52 +02:00
Efstratios Giannopoulos 1a76942b5f add Description PersistStatus 2023-12-04 18:38:23 +02:00
Diamantis Tziotzios a72c7001f9 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2023-12-04 18:26:31 +02:00
Efstratios Giannopoulos e441fc958c bug fix 2023-12-04 18:19:27 +02:00
Efstratios Giannopoulos 418d36dd67 dmp changes 2023-12-04 18:16:57 +02:00
Diamantis Tziotzios 84726a250f Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2023-12-04 17:56:35 +02:00
Diamantis Tziotzios 7c9e36341b more ui changes 2023-12-04 17:56:12 +02:00
Efstratios Giannopoulos df87dbf76c use new subquery 2023-12-04 17:27:47 +02:00
amentis 3ea60a4b43 add user roles listing filter 2023-12-01 13:18:20 +02:00
Efstratios Giannopoulos 5965acc4aa migration changes 2023-11-30 14:09:20 +02:00
Efstratios Giannopoulos 3a70b4d700 bug fixes 2023-11-30 13:38:36 +02:00
Efstratios Giannopoulos 2d5c9df855 support xml columns 2023-11-30 13:38:22 +02:00
Efstratios Giannopoulos 2a766dc37f storage file fixes 2023-11-30 13:37:56 +02:00
amentis 4417532935 add checkbox to language editor UI 2023-11-30 10:37:58 +02:00
Efstratios Giannopoulos 17d57dbc7a bug fix 2023-11-29 17:49:00 +02:00
Efstratios Giannopoulos b40134e6a7 user info changes 2023-11-29 17:41:15 +02:00
Efstratios Giannopoulos 0decfb1474 migration fixes 2023-11-29 16:56:25 +02:00
Thomas Georgios Giannos baaddb6284 Adding keycloak service and dependency 2023-11-29 16:12:56 +02:00
amentis 63a8820681 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
#	dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.html
2023-11-29 15:32:03 +02:00
amentis 2c914ead90 add ordinal in Language Entity 2023-11-29 15:27:27 +02:00
Diamantis Tziotzios b7ff88be3a Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2023-11-29 15:26:43 +02:00
Diamantis Tziotzios 7430477903 more frontend changes 2023-11-29 15:26:40 +02:00
Thomas Georgios Giannos bf07fed0f8 Refactoring on Dataset public API 2023-11-29 14:34:37 +02:00
Thomas Georgios Giannos 2fae4f41a7 Dmp on Dataset mapped for public API 2023-11-29 13:45:35 +02:00
Thomas Georgios Giannos b4d7312751 Dataset references mapped for public API 2023-11-29 13:07:46 +02:00
Thomas Georgios Giannos 5b5f547b27 Dataset listing model mapper implemented for public API 2023-11-29 11:57:49 +02:00
Thomas Georgios Giannos c6642a726e Preparing fetching datasets for public API 2023-11-29 11:30:38 +02:00
amentis 439efbd98a small fix 2023-11-29 10:46:49 +02:00
amentis 126d47f9e4 add language file fallback method 2023-11-28 19:10:04 +02:00
amentis 3d5c718d52 change supportive material editor model 2023-11-28 19:06:15 +02:00
Thomas Georgios Giannos 319e1f0dca Preparing fetching of associated dataset profiles for dmps for public API 2023-11-28 18:04:26 +02:00
Thomas Georgios Giannos b3bc801cd4 Fetching dois for dmps for public API 2023-11-28 17:29:25 +02:00
Efstratios Giannopoulos d3d57e8838 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2023-11-28 17:24:47 +02:00
Efstratios Giannopoulos 337556265e add storage 2023-11-28 17:23:56 +02:00
Thomas Georgios Giannos e6cba30e4c Fetching funders on grants for dmps for public API 2023-11-28 16:50:00 +02:00
Thomas Georgios Giannos b00b048632 Fetching and building organizations for dmps for public API 2023-11-28 16:20:31 +02:00
Thomas Georgios Giannos 693f1dba7f Fetching and building grants for dmps for public API 2023-11-28 15:52:17 +02:00
Efstratios Giannopoulos 1b92af8762 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2023-11-28 15:09:01 +02:00
Efstratios Giannopoulos 75d31cf627 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
#	dmp-backend/core/src/main/java/eu/eudat/audit/AuditableAction.java
2023-11-28 15:07:41 +02:00