Commit 8d7a9b32 authored 2 months ago by Oliver Schmidt

Merge branch 'main' into OZG-6185-AdjustStyling

# Conflicts:
#	alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts

parents d45d0e34 898a7c2d

No related branches found

No related tags found

Show whitespace changes

Inline Side-by-side

Showing

alfa-client/.prettierignore 2 additions, 1 deletion

alfa-client/.prettierignore
alfa-client/apps/admin/src/main.ts 5 additions, 4 deletions

alfa-client/apps/admin/src/main.ts
alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.spec.ts 1 addition, 1 deletion

...ds-form-page/statistik-fields-form-page.component.spec.ts
alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.ts 1 addition, 1 deletion

...-fields-form-page/statistik-fields-form-page.component.ts
alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-bescheid/vorgang-bescheid-historie.cy.ts 4 additions, 0 deletions

...in-tests/vorgang-bescheid/vorgang-bescheid-historie.cy.ts
alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-bescheid/vorgang-bescheid-info-anzeigen.cy.ts 9 additions, 33 deletions

...sts/vorgang-bescheid/vorgang-bescheid-info-anzeigen.cy.ts
alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-bescheid/vorgang-bescheid-nur-speichern.cy.ts 2 additions, 0 deletions

...sts/vorgang-bescheid/vorgang-bescheid-nur-speichern.cy.ts
alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-abschliessen.cy.ts 2 additions, 5 deletions

...in-tests/vorgang-detailansicht/vorgang-abschliessen.cy.ts
alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts 1 addition, 5 deletions

...tests/vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts
alfa-client/apps/alfa-e2e/src/support/cypress.util.ts 3 additions, 4 deletions

alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
alfa-client/libs/admin/keycloak-shared/src/lib/organisations-einheit.repository.spec.ts 2 additions, 0 deletions

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

...ycloak-shared/src/lib/organisations-einheit.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 3 additions, 0 deletions

...isations-einheit-shared/src/test/organisations-einheit.ts
alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.spec.ts 4 additions, 1 deletion

...ntainer/organisations-einheit-container.component.spec.ts
alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.ts 3 additions, 0 deletions

...it-container/organisations-einheit-container.component.ts
alfa-client/libs/admin/postfach-shared/project.json 1 addition, 1 deletion

alfa-client/libs/admin/postfach-shared/project.json
alfa-client/libs/admin/postfach-shared/src/lib/postfach-resource.service.ts 2 additions, 2 deletions

...dmin/postfach-shared/src/lib/postfach-resource.service.ts
alfa-client/libs/admin/postfach-shared/src/lib/postfach.model.ts 2 additions, 8 deletions

...ient/libs/admin/postfach-shared/src/lib/postfach.model.ts
alfa-client/libs/admin/postfach-shared/src/lib/postfach.service.spec.ts 3 additions, 2 deletions

...bs/admin/postfach-shared/src/lib/postfach.service.spec.ts

with 52 additions and 68 deletions

Please register or to comment