argos/dmp-frontend/src/app/ui/admin/user/listing/role-editor
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
..
user-role-editor.component.html Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-04-16 11:12:49 +03:00
user-role-editor.component.scss Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-04-16 11:12:49 +03:00
user-role-editor.component.ts user role page changes 2024-04-16 11:02:17 +03:00
user-role-editor.model.ts user role page changes 2024-04-16 11:02:17 +03:00
user-role-editor.service.ts refdactored users listing 2023-11-28 15:15:16 +02:00