Merge branch 'development' of...
Merge branch 'development' of https://ec.europa.eu/digital-building-blocks/code/scm/edelivery/smp into bugfix/EDELIVERY-13840-user-management-reset-password-tokens-are-not-expiring # Conflicts: # smp-angular/src/app/security/security.service.ts
No related branches found
No related tags found
Showing
- smp-angular/package.json 1 addition, 0 deletionssmp-angular/package.json
- smp-angular/proxy-config-docker.json 54 additions, 0 deletionssmp-angular/proxy-config-docker.json
- smp-angular/src/app/common/dialogs/session-expiration-dialog/session-expiration-dialog.component.html 3 additions, 1 deletion...xpiration-dialog/session-expiration-dialog.component.html
- smp-angular/src/app/common/global-lookups.ts 22 additions, 19 deletionssmp-angular/src/app/common/global-lookups.ts
- smp-angular/src/app/security/reset-credential/reset-credential.component.ts 27 additions, 4 deletions...p/security/reset-credential/reset-credential.component.ts
- smp-angular/src/app/security/security.service.ts 27 additions, 16 deletionssmp-angular/src/app/security/security.service.ts
- smp-angular/src/app/window/sidenav/navigation-model.service.ts 19 additions, 15 deletions...ngular/src/app/window/sidenav/navigation-model.service.ts
- smp-angular/src/assets/i18n/en.json 1 addition, 1 deletionsmp-angular/src/assets/i18n/en.json
- smp-angular/src/assets/i18n/ro.json 1 addition, 1 deletionsmp-angular/src/assets/i18n/ro.json
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialService.java 6 additions, 1 deletion...u/europa/ec/edelivery/smp/services/CredentialService.java
Loading