-
- Downloads
Merge remote-tracking branch 'origin/master' into OZG-5012-GenerischerResourceService
# Conflicts: # alfa-client/libs/admin-settings/src/lib/admin-settings.module.ts # alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.spec.ts # alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts # alfa-client/libs/admin-settings/src/lib/postfach/postfach.service.ts # alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts # alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts # alfa-client/libs/command-shared/src/index.ts # alfa-client/libs/tech-shared/src/index.ts # alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.spec.ts # alfa-client/libs/tech-shared/src/lib/resource/resource.service.itcase.spec.ts # alfa-client/libs/tech-shared/src/lib/resource/resource.service.spec.ts # alfa-client/libs/tech-shared/src/lib/resource/resource.service.ts # alfa-client/libs/tech-shared/src/lib/resource/resource.util.ts # alfa-client/libs/tech-shared/test/marbles.ts
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .vscode/settings.json 2 additions, 1 deletion.vscode/settings.json
- Jenkinsfile 5 additions, 9 deletionsJenkinsfile
- Jenkinsfile.admin 19 additions, 22 deletionsJenkinsfile.admin
- alfa-client/.gitignore 1 addition, 1 deletionalfa-client/.gitignore
- alfa-client/.prettierrc 5 additions, 2 deletionsalfa-client/.prettierrc
- alfa-client/.vscode/launch.json 37 additions, 0 deletionsalfa-client/.vscode/launch.json
- alfa-client/.vscode/settings.json 7 additions, 1 deletionalfa-client/.vscode/settings.json
- alfa-client/apps/admin/src/app/app.component.html 14 additions, 2 deletionsalfa-client/apps/admin/src/app/app.component.html
- alfa-client/apps/admin/src/app/app.component.spec.ts 62 additions, 16 deletionsalfa-client/apps/admin/src/app/app.component.spec.ts
- alfa-client/apps/admin/src/app/app.component.ts 3 additions, 1 deletionalfa-client/apps/admin/src/app/app.component.ts
- alfa-client/apps/admin/src/app/app.module.ts 12 additions, 8 deletionsalfa-client/apps/admin/src/app/app.module.ts
- alfa-client/apps/admin/src/main/helm/templates/_helpers.tpl 18 additions, 0 deletionsalfa-client/apps/admin/src/main/helm/templates/_helpers.tpl
- alfa-client/apps/admin/src/main/helm/templates/deployment.yaml 2 additions, 2 deletions...client/apps/admin/src/main/helm/templates/deployment.yaml
- alfa-client/apps/admin/src/main/helm/templates/network_policy.yaml 8 additions, 2 deletions...nt/apps/admin/src/main/helm/templates/network_policy.yaml
- alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.spec.ts 0 additions, 2 deletions...es/postfach/postfach-page/postfach-page.component.spec.ts
- alfa-client/apps/admin/src/pages/unavailable/unavailable-page/unavailable-page.component.html 7 additions, 0 deletions...vailable/unavailable-page/unavailable-page.component.html
- alfa-client/apps/admin/src/pages/unavailable/unavailable-page/unavailable-page.component.spec.ts 21 additions, 0 deletions...lable/unavailable-page/unavailable-page.component.spec.ts
- alfa-client/apps/admin/src/pages/unavailable/unavailable-page/unavailable-page.component.ts 8 additions, 0 deletions...navailable/unavailable-page/unavailable-page.component.ts
- alfa-client/apps/admin/src/test/helm/deployment_env_test.yaml 24 additions, 1 deletion...-client/apps/admin/src/test/helm/deployment_env_test.yaml
Loading
Please register or sign in to comment