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
..
common/enum	Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring	2024-04-16 11:12:49 +03:00
model	user role page changes	2024-04-16 11:02:17 +03:00
pipes	remove currency from description template field type enum	2024-04-09 18:28:07 +03:00
query	moved notification services and components under the "src\notification-service"	2024-04-12 17:37:37 +03:00
services	user role page changes	2024-04-16 11:02:17 +03:00
admin-auth-guard.service.ts	authn refactor	2023-10-11 17:53:12 +03:00
auth-guard.service.ts	task #9088 Authorization model should be changed to be Permission based	2023-10-17 17:13:34 +03:00
core-service.module.ts	moved notification services and components under the "src\notification-service"	2024-04-12 17:37:37 +03:00
formatting.module.ts	styling changes	2024-03-20 13:06:39 +02:00
special-auth-guard.service.ts	authn refactor	2023-10-11 17:53:12 +03:00