Commit Graph

356 Commits

Author SHA1 Message Date
267becfbce progress @fees, next step, deply+enter families/student/pupil/...
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-01-19 00:39:15 +01:00
474db1232d start working on calculating member fees
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m54s
CI/CD Pipeline / deploy-staging (push) Successful in 4m20s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-18 21:36:38 +01:00
07c76f4e64 add family
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-01-18 16:37:54 +01:00
66365c4a68 fix typo
All checks were successful
CI/CD Pipeline / test (push) Successful in 7m47s
CI/CD Pipeline / deploy-staging (push) Successful in 4m22s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-18 09:32:25 +01:00
c372051561 try
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test-frontend (push) Failing after 13m30s
CI/CD Pipeline / test-backend (push) Has been cancelled
2024-01-16 22:29:57 +01:00
bbfc94d54b add mail
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-01-10 15:52:27 +01:00
87e4b8fbb4 fix redirect
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-01-10 15:10:05 +01:00
3e2e058bcc limit users to proper role, Fixes #135
Some checks are pending
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Successful in 15m47s
2024-01-10 14:08:15 +01:00
2726db433e Merge pull request 'allow to add logbook entries up to a week late; show all boats in boatshouse; don't show guests for external boats' (#141) from fixes into main
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
Reviewed-on: #141
2024-01-04 20:44:26 +01:00
bada4deedd allow to add logbook entries up to a week late; show all boats in boatshouse; don't show guests for external boats
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2024-01-04 20:43:38 +01:00
f5bfb9fbdf fix weird iphone issue
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-01-03 09:59:09 +01:00
e925fadbb8 fix boat damage show
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m6s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-01 18:54:44 +01:00
0ad342b147 add mail
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2024-01-01 15:50:06 +01:00
cf5b2751dd better filter:
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m49s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-30 21:30:27 +01:00
5800f137f3 add data from nx
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2023-12-30 21:21:30 +01:00
c7d7d0ca83 in preparation to moving userdata into app, we switched to arbitrary groups
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m4s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-23 21:27:52 +01:00
aca5340370 show guest km, Fixes #41
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m56s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-23 15:26:49 +01:00
4297c8e971 Merge pull request 'add css magic from marie' (#73) from years-changeable into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m58s
CI/CD Pipeline / deploy-staging (push) Successful in 15m6s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #73
2023-11-20 18:43:04 +01:00
72aeeb5eab add css magic from marie
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m52s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-20 18:42:32 +01:00
2b427438b8 Merge pull request 'fix-typo' (#70) from fix-typo into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m50s
CI/CD Pipeline / deploy-staging (push) Successful in 14m46s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #70
2023-11-20 17:55:11 +01:00
c2f3c541fd fix typo
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m41s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-20 17:54:41 +01:00
9ef1cd3459 make years in stat changeable
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m51s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-20 17:52:10 +01:00
08202691f6 push 2023-11-19 22:02:25 +01:00
fea5b6f3d8 push
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m1s
CI/CD Pipeline / deploy-staging (push) Successful in 15m4s
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-19 21:41:46 +01:00
5c7cd58edc Merge branch 'ergo-again' into 'staging'
Ergo again

See merge request PhilippHofer/rot!120
2023-11-16 14:00:41 +00:00
b361fbbe50 link new urls + fix typo 2023-11-16 14:46:40 +01:00
Marie Birner
e1b9cdcd3b Merge branch 'ergo-style' into staging 2023-11-14 11:49:08 +01:00
Marie Birner
19fc50d711 [TASK] ergo styling 2023-11-14 11:48:33 +01:00
9749d0a6df Merge branch 'ergo-desc' into 'main'
add notes about ergo challenge

See merge request PhilippHofer/rot!97
2023-11-12 18:25:55 +00:00
56163a4732 Merge branch 'finalize-ergo' into 'staging'
push

See merge request PhilippHofer/rot!111
2023-11-12 14:35:57 +00:00
55fc8b6db1 push 2023-11-12 15:22:30 +01:00
65edd4caa8 Merge branch 'ergo-desc' into 'staging'
Ergo desc

See merge request PhilippHofer/rot!106
2023-11-10 12:24:55 +00:00
8dc38a4fc0 improve text 2023-11-10 13:11:46 +01:00
fee89b0f19 fix link 2023-11-10 13:10:46 +01:00
23a21b55c7 Merge branch 'new-people' into 'staging'
improve text

See merge request PhilippHofer/rot!101
2023-11-10 09:30:56 +00:00
5c3be25285 Merge branch 'ergo-desc' into 'staging'
more concise

See merge request PhilippHofer/rot!100
2023-11-10 09:30:52 +00:00
e5f6a543e1 improve text 2023-11-10 09:03:04 +01:00
b929c757ce more concise 2023-11-10 08:56:36 +01:00
87b5cff190 Merge branch 'new-people' into 'staging'
New people

See merge request PhilippHofer/rot!98
2023-11-09 21:29:59 +00:00
9b86d93979 try to get new people 2023-11-09 22:02:31 +01:00
9bfa89a841 Merge branch 'ergo-desc' into 'staging'
add notes about ergo challenge

See merge request PhilippHofer/rot!96
2023-11-09 21:02:28 +00:00
8926d82bd6 add notes about ergo challenge 2023-11-09 21:48:21 +01:00
Marie Birner
8c5fbfec63 [BUGFIX] filter issues 2023-11-09 21:02:21 +01:00
Marie Birner
609483f1df [BUGFIX] color text and btn dark-mode 2023-11-09 19:40:41 +01:00
Marie Birner
3467e02748 [BUGFIX] color label dark-mode 2023-11-09 19:37:46 +01:00
715fae59fc implement default destination for boats 2023-11-09 08:56:08 +01:00
04958d80a4 Merge branch 'staging' into 'input-val'
# Conflicts:
#   templates/ergo.html.tera
#   templates/includes/macros.html.tera
2023-11-08 17:02:32 +00:00
e7a6d57bf0 simple (client only) val 2023-11-08 18:00:27 +01:00
61cc470e0f also allow dozen updates 2023-11-07 22:01:34 +01:00
4f4c053d0e ergo-admin-edit 2023-11-07 21:27:40 +01:00