Commit 8e1737cd authored 5 months ago by Martin

Merge remote-tracking branch 'origin/main' into OZG-7474-WeiterleitenButton

# Conflicts:
#	alfa-client/libs/design-component/src/lib/routing-button/routing-button.component.spec.ts

parents 598961ec 1b211dc4

No related branches found

No related tags found

1 merge request!49Ozg 7474 weiterleiten button

Show whitespace changes

Inline Side-by-side

Showing

alfa-client/apps/admin-e2e/src/components/benutzer/benutzer.e2e.component.ts 18 additions, 19 deletions

...min-e2e/src/components/benutzer/benutzer.e2e.component.ts
alfa-client/apps/admin-e2e/src/e2e/main-tests/benutzer_rollen/benutzer-zu-oe-hinzufuegen.cy.ts 9 additions, 10 deletions

...in-tests/benutzer_rollen/benutzer-zu-oe-hinzufuegen.cy.ts
alfa-client/apps/admin-e2e/src/model/util.ts 2 additions, 2 deletions

alfa-client/apps/admin-e2e/src/model/util.ts
alfa-client/libs/admin/keycloak-shared/src/lib/form.util.spec.ts 12 additions, 0 deletions

...ient/libs/admin/keycloak-shared/src/lib/form.util.spec.ts
alfa-client/libs/admin/keycloak-shared/src/lib/form.util.ts 4 additions, 4 deletions

alfa-client/libs/admin/keycloak-shared/src/lib/form.util.ts
alfa-client/libs/admin/keycloak-shared/src/lib/keycloak.resource.service.ts 4 additions, 1 deletion

...dmin/keycloak-shared/src/lib/keycloak.resource.service.ts
alfa-client/libs/admin/keycloak-shared/src/lib/organisations-einheit.repository.spec.ts 24 additions, 11 deletions

...k-shared/src/lib/organisations-einheit.repository.spec.ts
alfa-client/libs/admin/keycloak-shared/src/lib/organisations-einheit.repository.ts 4 additions, 4 deletions

...ycloak-shared/src/lib/organisations-einheit.repository.ts
alfa-client/libs/admin/keycloak-shared/src/lib/user.repository.spec.ts 282 additions, 99 deletions

...ibs/admin/keycloak-shared/src/lib/user.repository.spec.ts
alfa-client/libs/admin/keycloak-shared/src/lib/user.repository.ts 37 additions, 4 deletions

...ent/libs/admin/keycloak-shared/src/lib/user.repository.ts
alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.model.ts 1 addition, 0 deletions

...ons-einheit-shared/src/lib/organisations-einheit.model.ts
alfa-client/libs/admin/organisations-einheit-shared/src/test/organisations-einheit.ts 1 addition, 0 deletions

...isations-einheit-shared/src/test/organisations-einheit.ts
alfa-client/libs/admin/user-shared/src/lib/user.model.ts 2 additions, 1 deletion

alfa-client/libs/admin/user-shared/src/lib/user.model.ts
alfa-client/libs/admin/user-shared/test/user.ts 1 addition, 0 deletions

alfa-client/libs/admin/user-shared/test/user.ts
alfa-client/libs/admin/user/src/lib/user-form/user-form-data/user-form-data.component.html 0 additions, 1 deletion

...ib/user-form/user-form-data/user-form-data.component.html
alfa-client/libs/admin/user/src/lib/user-form/user-form-headline/user-form-headline.component.html 7 additions, 0 deletions

...form/user-form-headline/user-form-headline.component.html
alfa-client/libs/admin/user/src/lib/user-form/user-form-headline/user-form-headline.component.spec.ts 45 additions, 0 deletions

...m/user-form-headline/user-form-headline.component.spec.ts
alfa-client/libs/admin/user/src/lib/user-form/user-form-headline/user-form-headline.component.ts 11 additions, 0 deletions

...r-form/user-form-headline/user-form-headline.component.ts
alfa-client/libs/admin/user/src/lib/user-form/user-form-save-button/user-form-save-button.component.html 6 additions, 0 deletions

...ser-form-save-button/user-form-save-button.component.html
alfa-client/libs/admin/user/src/lib/user-form/user-form-save-button/user-form-save-button.component.spec.ts 89 additions, 0 deletions

...-form-save-button/user-form-save-button.component.spec.ts

with 559 additions and 156 deletions

Please register or to comment