Diamantis Tziotzios 0c1509a1a1 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring ... # Conflicts: # dmp-backend/core/src/main/java/eu/eudat/audit/AuditableAction.java		2023-10-23 11:27:03 +03:00
..
common/enum	Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring	2023-10-20 18:01:15 +03:00
model	Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring	2023-10-20 18:01:15 +03:00
pipes	update to angular 14	2023-10-05 16:39:17 +03:00
query	description template type and dmp blueprint frontend changes	2023-10-20 18:01:09 +03:00
services	Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring	2023-10-23 11:27:03 +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	description template type and dmp blueprint frontend changes	2023-10-20 18:01:09 +03:00
formatting.module.ts	description template type and dmp blueprint frontend changes	2023-10-20 18:01:09 +03:00
special-auth-guard.service.ts	authn refactor	2023-10-11 17:53:12 +03:00