Efstratios Giannopoulos c67e4c8c9f Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring ... # Conflicts: # dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpDatasetProfileMigrationService.java # dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/migration/MigrationController.java		2023-11-24 17:26:18 +02:00
..
cache	Migrating packages to resolve conflicts with the refactored project	2023-11-20 12:19:02 +02:00
configurations	Fixing issues, resolving column naming conflicts between old and new entity classes	2023-11-20 16:44:55 +02:00
controllers	Migrating packages to resolve conflicts with the refactored project (part 2)	2023-11-20 12:29:24 +02:00
criteria	Migrating packages to resolve conflicts with the refactored project	2023-11-20 12:19:02 +02:00
exceptions	Migrating packages to resolve conflicts with the refactored project	2023-11-20 12:19:02 +02:00
logic	Adding migration for reference middle tables	2023-11-24 11:36:43 +02:00
migration	Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring	2023-11-24 17:26:18 +02:00
models	Adding dataset migration service	2023-11-23 10:26:40 +02:00
publicapi	Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring	2023-11-24 17:26:18 +02:00
types	Migrating packages to resolve conflicts with the refactored project	2023-11-20 12:19:02 +02:00
EuDatApplication.java	Fixing issues, resolving column naming conflicts between old and new entity classes	2023-11-20 16:44:55 +02:00