Skip to content

Commit ac511d7

Browse files
committed
Merge branch 'main' into feature-zmskvr-1378-planned-booked-capacity-statistics-mvp
2 parents 03d54d9 + 3551f82 commit ac511d7

89 files changed

Lines changed: 1796 additions & 1178 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ddev/docker-compose.keycloak.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
keycloak:
3-
image: quay.io/keycloak/keycloak:26.6.2@sha256:f9ba7b2af90db8dc749a57ca9aedca51e840cb9224441ab546a968da941da900
3+
image: quay.io/keycloak/keycloak:26.6.3@sha256:5fdbf2dbb5897cc34e82de49d13e23db011f9925089dbc555fc095f2c8bc1dac
44
container_name: ddev-${DDEV_SITENAME}-keycloak
55
command:
66
- start-dev

.devcontainer/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ services:
7373
restart: unless-stopped
7474

7575
keycloak:
76-
image: quay.io/keycloak/keycloak:26.6.2@sha256:f9ba7b2af90db8dc749a57ca9aedca51e840cb9224441ab546a968da941da900
76+
image: quay.io/keycloak/keycloak:26.6.3@sha256:5fdbf2dbb5897cc34e82de49d13e23db011f9925089dbc555fc095f2c8bc1dac
7777
container_name: zms-keycloak
7878
hostname: keycloak
7979
command:

.github/CODEOWNERS

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
@manjencic @ThomasAFink @tobiasholler @lehju @matthilo96 @MoDaae @Fabinatix97
1+
# These owners will be the default owners for everything in the repo.
2+
* @it-at-m/eappointment_admin @it-at-m/eappointment_devs @it-at-m/eappointment_maintainer
3+
4+
# Protect CODEOWNERS file itself against modification
5+
/.github/CODEOWNERS @it-at-m/eappointment_admin
6+
7+
# Protect GitHub Actions against modification
8+
/.github/workflows @it-at-m/eappointment_admin
Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ We as members, contributors, and leaders pledge to make participation in our
66
community a harassment-free experience for everyone, regardless of age, body
77
size, visible or invisible disability, ethnicity, sex characteristics, gender
88
identity and expression, level of experience, education, socio-economic status,
9-
nationality, personal appearance, race, religion, or sexual identity
10-
and orientation.
9+
nationality, personal appearance, race, caste, color, religion, or sexual
10+
identity and orientation.
1111

1212
We pledge to act and interact in ways that contribute to an open, welcoming,
1313
diverse, inclusive, and healthy community.
@@ -22,17 +22,17 @@ community include:
2222
* Giving and gracefully accepting constructive feedback
2323
* Accepting responsibility and apologizing to those affected by our mistakes,
2424
and learning from the experience
25-
* Focusing on what is best not just for us as individuals, but for the
26-
overall community
25+
* Focusing on what is best not just for us as individuals, but for the overall
26+
community
2727

2828
Examples of unacceptable behavior include:
2929

30-
* The use of sexualized language or imagery, and sexual attention or
31-
advances of any kind
30+
* The use of sexualized language or imagery, and sexual attention or advances of
31+
any kind
3232
* Trolling, insulting or derogatory comments, and personal or political attacks
3333
* Public or private harassment
34-
* Publishing others' private information, such as a physical or email
35-
address, without their explicit permission
34+
* Publishing others' private information, such as a physical or email address,
35+
without their explicit permission
3636
* Other conduct which could reasonably be considered inappropriate in a
3737
professional setting
3838

@@ -52,7 +52,7 @@ decisions when appropriate.
5252

5353
This Code of Conduct applies within all community spaces, and also applies when
5454
an individual is officially representing the community in public spaces.
55-
Examples of representing our community include using an official e-mail address,
55+
Examples of representing our community include using an official email address,
5656
posting via an official social media account, or acting as an appointed
5757
representative at an online or offline event.
5858

@@ -81,15 +81,15 @@ behavior was inappropriate. A public apology may be requested.
8181

8282
### 2. Warning
8383

84-
**Community Impact**: A violation through a single incident or series
85-
of actions.
84+
**Community Impact**: A violation through a single incident or series of
85+
actions.
8686

8787
**Consequence**: A warning with consequences for continued behavior. No
8888
interaction with the people involved, including unsolicited interaction with
8989
those enforcing the Code of Conduct, for a specified period of time. This
9090
includes avoiding interactions in community spaces as well as external channels
91-
like social media. Violating these terms may lead to a temporary or
92-
permanent ban.
91+
like social media. Violating these terms may lead to a temporary or permanent
92+
ban.
9393

9494
### 3. Temporary Ban
9595

@@ -105,23 +105,27 @@ Violating these terms may lead to a permanent ban.
105105
### 4. Permanent Ban
106106

107107
**Community Impact**: Demonstrating a pattern of violation of community
108-
standards, including sustained inappropriate behavior, harassment of an
108+
standards, including sustained inappropriate behavior, harassment of an
109109
individual, or aggression toward or disparagement of classes of individuals.
110110

111-
**Consequence**: A permanent ban from any sort of public interaction within
112-
the community.
111+
**Consequence**: A permanent ban from any sort of public interaction within the
112+
community.
113113

114114
## Attribution
115115

116116
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
117-
version 2.0, available at
118-
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
117+
version 2.1, available at
118+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
119119

120-
Community Impact Guidelines were inspired by [Mozilla's code of conduct
121-
enforcement ladder](https://github.com/mozilla/diversity).
122-
123-
[homepage]: https://www.contributor-covenant.org
120+
Community Impact Guidelines were inspired by
121+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
124122

125123
For answers to common questions about this code of conduct, see the FAQ at
126-
https://www.contributor-covenant.org/faq. Translations are available at
127-
https://www.contributor-covenant.org/translations.
124+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
125+
[https://www.contributor-covenant.org/translations][translations].
126+
127+
[homepage]: https://www.contributor-covenant.org
128+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
129+
[Mozilla CoC]: https://github.com/mozilla/diversity
130+
[FAQ]: https://www.contributor-covenant.org/faq
131+
[translations]: https://www.contributor-covenant.org/translations
Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
name: 🐞 Bug report
2+
description: Report a bug to help the project improve.
3+
title: "[Bug] "
4+
labels: ["Type: Bug"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this bug report!
10+
To expedite issue processing, please search open and closed issues before submitting a new one.
11+
Please read our [Code of Conduct](../blob/main/.github/CODE_OF_CONDUCT.md).
12+
- type: markdown
13+
attributes:
14+
value: "## General"
15+
- type: textarea
16+
id: description
17+
attributes:
18+
label: Bug description
19+
description: A clear and concise description of what the bug is
20+
validations:
21+
required: true
22+
- type: textarea
23+
id: expectation
24+
attributes:
25+
label: Expected behaviour
26+
description: A clear and concise description of what you expected to happen
27+
validations:
28+
required: true
29+
- type: textarea
30+
id: reproduction-steps
31+
attributes:
32+
label: Steps for reproduction
33+
description: Detailed list of steps for reproducing the bug
34+
placeholder: |
35+
1. Use x argument / navigate to
36+
2. Fill this information
37+
3. Go to...
38+
4. See error
39+
validations:
40+
required: true
41+
- type: markdown
42+
attributes:
43+
value: "## Version and environment information"
44+
- type: input
45+
id: version
46+
attributes:
47+
label: Affected version
48+
description: Version of the project the bug is concerned to
49+
placeholder: e.g. 1.0.2
50+
validations:
51+
required: true
52+
- type: dropdown
53+
id: module
54+
attributes:
55+
label: Relevant module
56+
multiple: true
57+
description: Name(s) of the affected module(s) (if applicable)
58+
options:
59+
- mellon
60+
- zmsadmin
61+
- zmsapi
62+
- zmsautomation
63+
- zmsbase
64+
- zmscalldisplay
65+
- zmscitizenapi
66+
- zmscitizenview
67+
- zmsclient
68+
- zmsdb
69+
- zmsdldb
70+
- zmsentities
71+
- zmslayout
72+
- zmsmessaging
73+
- zmsslim
74+
- zmsstatistic
75+
- zmsticketprinter
76+
- other
77+
validations:
78+
required: false
79+
- type: input
80+
id: last-working-version
81+
attributes:
82+
label: Last working version (optional)
83+
description: Last version of the project where the bug was not present
84+
placeholder: e.g. 1.0.1
85+
validations:
86+
required: false
87+
- type: dropdown
88+
id: os
89+
attributes:
90+
label: Operating system
91+
multiple: true
92+
description: Operating systems the bug occurs on (optional, only if applicable)
93+
options:
94+
- Windows
95+
- macOS
96+
- Linux
97+
- Other
98+
validations:
99+
required: false
100+
- type: dropdown
101+
id: browser
102+
attributes:
103+
label: Browser
104+
multiple: true
105+
description: Browsers the bug occurs on (optional, only if applicable)
106+
options:
107+
- Firefox
108+
- Chrome
109+
- Safari
110+
- Edge
111+
- Other
112+
validations:
113+
required: false
114+
- type: markdown
115+
attributes:
116+
value: "## Extras"
117+
- type: textarea
118+
id: logs
119+
attributes:
120+
label: Relevant log output (optional)
121+
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
122+
render: shell
123+
validations:
124+
required: false
125+
- type: textarea
126+
id: screenshots
127+
attributes:
128+
label: Screenshots (optional)
129+
description: You can attach images or log files by clicking this area to highlight it and then dragging files in.
130+
validations:
131+
required: false
132+
- type: textarea
133+
id: context
134+
attributes:
135+
label: Additional context (optional)
136+
description: Additional context (references, links, ...) that might be helpful
137+
validations:
138+
required: false
139+
- type: markdown
140+
attributes:
141+
value: "## Confirmations"
142+
- type: checkboxes
143+
id: check-duplicate
144+
attributes:
145+
label: No duplicate
146+
description: By submitting this issue, you confirm to have checked for duplicate issues beforehand.
147+
options:
148+
- label: I confirm that this issue is not a duplicate
149+
required: true
150+
- type: checkboxes
151+
id: conduct
152+
attributes:
153+
label: Code of Conduct
154+
description: By submitting this issue, you agree to follow our [Code of Conduct](../blob/main/.github/CODE_OF_CONDUCT.md).
155+
options:
156+
- label: I agree to follow this project's Code of Conduct
157+
required: true
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
name: ✨ Feature request
2+
description: Suggest an idea or possible new feature for this project.
3+
title: "[Feature] "
4+
labels: ["Type: Feature"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this feature request!
10+
To expedite issue processing, please search open and closed issues before submitting a new one.
11+
Please read our [Code of Conduct](../blob/main/.github/CODE_OF_CONDUCT.md).
12+
- type: markdown
13+
attributes:
14+
value: "## General"
15+
- type: dropdown
16+
id: module
17+
attributes:
18+
label: Relevant module
19+
multiple: true
20+
description: Name(s) of the affected module(s) (if applicable)
21+
options:
22+
- mellon
23+
- zmsadmin
24+
- zmsapi
25+
- zmsautomation
26+
- zmsbase
27+
- zmscalldisplay
28+
- zmscitizenapi
29+
- zmscitizenview
30+
- zmsclient
31+
- zmsdb
32+
- zmsdldb
33+
- zmsentities
34+
- zmslayout
35+
- zmsmessaging
36+
- zmsslim
37+
- zmsstatistic
38+
- zmsticketprinter
39+
- other
40+
validations:
41+
required: false
42+
- type: textarea
43+
id: problem-description
44+
attributes:
45+
label: Problem description (optional)
46+
description: A clear and concise description of what the problem is (if related to problem)
47+
placeholder: |
48+
e.g. I'm always frustrated when ...
49+
validations:
50+
required: false
51+
- type: textarea
52+
id: desired-solution
53+
attributes:
54+
label: Desired solution
55+
description: A clear and concise description of what you want to happen
56+
validations:
57+
required: true
58+
- type: textarea
59+
id: alternatives
60+
attributes:
61+
label: Considered alternatives (optional)
62+
description: A clear and concise description of any alternative solutions or features you've considered
63+
validations:
64+
required: false
65+
- type: markdown
66+
attributes:
67+
value: "## Extras"
68+
- type: textarea
69+
id: context
70+
attributes:
71+
label: Additional context (optional)
72+
description: Additional context (references, links, screenshots, ...) that might be helpful
73+
validations:
74+
required: false
75+
- type: markdown
76+
attributes:
77+
value: "## Confirmations"
78+
- type: checkboxes
79+
id: check-duplicate
80+
attributes:
81+
label: No duplicate
82+
description: By submitting this issue, you confirm to have checked for duplicate issues beforehand.
83+
options:
84+
- label: I confirm that this issue is not a duplicate
85+
required: true
86+
- type: checkboxes
87+
id: conduct
88+
attributes:
89+
label: Code of Conduct
90+
description: By submitting this issue, you agree to follow our [Code of Conduct](../blob/main/.github/CODE_OF_CONDUCT.md).
91+
options:
92+
- label: I agree to follow this project's Code of Conduct
93+
required: true

0 commit comments

Comments
 (0)