Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging -> Master; ST food in ca at Obrok24 #273

Merged
merged 12 commits into from
Apr 23, 2024
Merged

Staging -> Master; ST food in ca at Obrok24 #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b290160
altered Guest content and some translates for ObrokEventType (Obrok 24)
paaton Apr 17, 2024
9d2f389
added cancelled status
Apr 17, 2024
3233dab
Merge remote-tracking branch 'refs/remotes/origin/staging' into staging
Apr 17, 2024
e8a4722
Merge branch 'refs/heads/master' into staging
Apr 17, 2024
e617c2b
linted code
Apr 19, 2024
9ac9e0a
fixed phpstan + updated libraries
Apr 19, 2024
7f02345
resolved few TODOs + make all admin methods working with participants…
Apr 21, 2024
48d24fe
done all admin methods working with payments event-aware
Apr 21, 2024
4116c1a
SRSImport now checks for already existing import users in kissj db (#…
paaton Apr 21, 2024
7ef73d9
fixed negated bool stan error at ImportSrs.php
paaton Apr 21, 2024
cb3a78f
Add food into ca of Obrok ISTs
paaton Apr 22, 2024
c6ef493
Merge branch 'master' into staging
paaton Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Event/EventType/Obrok/EventTypeObrok.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public function getContentArbiterGuest(): ContentArbiterGuest
$ca->contingent = false;
$ca->medicaments = true;
$ca->printedHandbook = false;
$ca->food = true;
$ca->arrivalDate = true;
$ca->departureDate = true;
$ca->languages = true;
Expand Down
1 change: 1 addition & 0 deletions src/Event/EventType/Obrok/cs_obrok.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ detail:
patrolNamePlaceholder: "Jméno vaší skupiny"
language: "jednotka, se kterou na Obrok jedeš"
language-placeholder: "možnosti: SOS, SZT, Uši pro duši, Radio Tým "
foodHeader: "dietní omezení"
contingentTitle: "Pozice"
contingent:
volunteer: "💪 Dobrovolkyně nebo dobrovolník"
Expand Down
Loading