MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity
argos/dmp-frontend/src/app/ui/admin/user/listing
History
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
..
filters ui fixes on listing screens > filters 2024-04-15 13:01:58 +03:00
role-editor Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-04-16 11:12:49 +03:00
user-listing.component.html user role page changes 2024-04-16 11:02:17 +03:00
user-listing.component.scss styling changes 2024-03-29 14:41:19 +02:00
user-listing.component.ts user role page changes 2024-04-16 11:02:17 +03:00