Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

frontend-clients
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

f6e9ce87

Commit f6e9ce87 authored 1 year ago by OZGCloud

Downloads
- Plain Diff

Merge branch 'master' into OZG-4527-aktenzeichen-manuell-eingeben-dark-mode

# Conflicts:
#	alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts

parents 70aeb09b 49a91e56

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

alfa-client/apps/alfa-e2e/Jenkinsfile 4 additions, 0 deletions

alfa-client/apps/alfa-e2e/Jenkinsfile
alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.html 3 additions, 2 deletions

.../src/lib/ui/editor/text-editor/text-editor.component.html
alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts 4 additions, 0 deletions

...c/lib/ui/editor/text-editor/text-editor.component.spec.ts
alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts 3 additions, 1 deletion

...ui/src/lib/ui/editor/text-editor/text-editor.component.ts
alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.html 1 addition, 0 deletions

...ichen-edit-dialog/aktenzeichen-edit-dialog.component.html
alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.scss 2 additions, 5 deletions

...ichen-edit-dialog/aktenzeichen-edit-dialog.component.scss
alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts 6 additions, 6 deletions

...zeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts

with 23 additions and 14 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Impressum - Datenschutz - Barrierefreiheit