argos/dmp-backend/core/src/main/java/eu/eudat
Efstratios Giannopoulos 48352f0461 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
#	dmp-frontend/src/app/core/common/enum/app-role.ts
#	dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts
#	dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html
#	dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss
#	dmp-frontend/src/assets/i18n/en.json
2024-04-16 11:12:49 +03:00
..
audit description template upload changes, dmp description tag field type fix 2024-04-11 17:30:55 +03:00
authorization fix cache to use tenant 2024-04-05 11:34:30 +03:00
commons user role page changes 2024-04-16 11:02:17 +03:00
convention Updating Spring to version 6, adding service stack for DescriptionType entity 2023-10-03 17:29:45 +03:00
data remove allowNullTenant 2024-04-09 18:19:10 +03:00
elastic bug fixes 2024-04-11 18:09:47 +03:00
errorcode Add belongsToCurrentTenant to builders 2024-04-03 13:22:22 +03:00
event more frontend changes 2023-12-28 17:18:49 +02:00
integrationevent multitenant changes 2024-04-04 16:39:40 +03:00
model user role page changes 2024-04-16 11:02:17 +03:00
query Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-04-16 11:12:49 +03:00
service Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-04-16 11:12:49 +03:00
utilities fix elastic configuration 2024-03-19 12:11:01 +02:00