Commit Graph

1918 Commits

Author SHA1 Message Date
8773bbb9d1 Merge branch 'main' into no-boat-selected-by-default-in-logbook
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-04-29 22:29:52 +02:00
89ac4974db Merge pull request 'rephrase scheckbuch button' (#461) from rephrase-scheckbuch-button into main
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
Reviewed-on: #461
2024-04-29 22:29:16 +02:00
e4f1528b15 fix ci; proper click @ boat selector
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m27s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-29 22:17:40 +02:00
c449e878f0 rephrase scheckbuch button
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m50s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-29 21:51:27 +02:00
311e611d5f no boat is selected by default in the logbook -> users don't accidentally 'select' external boat
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-04-29 21:40:35 +02:00
8e5661b2f3 Merge pull request 'treat empty membership pdf as non-existing' (#457) from treat-empty-membershippdf-as-nonexisting into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m10s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 6m7s
Reviewed-on: #457
2024-04-29 21:33:49 +02:00
139acb2ec5 treat empty membership pdf as non-existing
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m3s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-29 21:10:34 +02:00
5dcd7bc745 Merge pull request 'proper-time-in-notificatoins' (#453) from proper-time-in-notificatoins into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 7m56s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m20s
Reviewed-on: #453
2024-04-29 09:18:58 +02:00
08fe779403 remove debug println
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m40s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-29 08:48:43 +02:00
9ca510b892 show proper time in notifications
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-04-29 08:48:15 +02:00
d01895df90 Merge pull request 'don't respond with 500 if no rower is selected' (#451) from require-user-for-logentry into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 7m46s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 6m18s
Reviewed-on: #451
2024-04-28 19:25:33 +02:00
c27a2ad15e don't respond with 500 if no rower is selected
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m43s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-28 19:16:38 +02:00
18047d16bf Merge pull request 'fix spacing if boat was steered by hand' (#447) from fix-spacing into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 7m44s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m32s
Reviewed-on: #447
2024-04-26 10:07:03 +02:00
e2306e890d Merge pull request 'if user is logged in, use that user as default rower' (#445) from prefill-own-user-default-log into main
Some checks are pending
CI/CD Pipeline / test (push) Waiting to run
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Reviewed-on: #445
2024-04-26 09:59:09 +02:00
46f8ca230a fix spacing if boat was steered by hand
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m1s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-26 09:54:24 +02:00
fcf86c7ff1 if user is logged in, use that user as default rower
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m26s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-26 09:50:01 +02:00
123b4bd39f Merge pull request 'no-special-treatment-with-boatname' (#442) from no-special-treatment-with-boatname into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m10s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m34s
Reviewed-on: #442
2024-04-24 17:23:49 +02:00
5eadfd42bb don't show link if the user has no permission
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-04-24 17:18:57 +02:00
87307378c6 no special treatment for 'externes boot' 2024-04-24 17:15:53 +02:00
8b42bdce0c Merge pull request 'easier handling of external boats, show all in separate category' (#440) from log-handle-external-boats into main
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
Reviewed-on: #440
2024-04-24 17:03:44 +02:00
237377dc05 easier handling of external boats, show all in separate category
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m45s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-24 16:56:48 +02:00
fc7ca28f56 Merge pull request 'fix-ci-db' (#438) from fix-ci-db into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m3s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m16s
Reviewed-on: #438
2024-04-24 16:41:02 +02:00
a42191715d fix ci
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-04-24 15:56:40 +02:00
43e073c54e calc general boat cat (#436)
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m1s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m19s
Reviewed-on: #436
2024-04-24 15:39:13 +02:00
8e03c935a5 fix ci
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m20s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-24 15:32:33 +02:00
0560ed7a6a fix ci
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-04-24 15:29:52 +02:00
07b197cc63 check changing of handoperated in backend
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-04-24 15:25:42 +02:00
a1ebd59f22 calc general boat cat
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-04-24 15:12:27 +02:00
aac7444896 Merge pull request 'handoperatable-feature' (#432) from handoperatable-feature into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m14s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 4m57s
Reviewed-on: #432
2024-04-24 14:43:24 +02:00
d646996c80 Merge branch 'main' into handoperatable-feature
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m48s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-24 12:21:07 +02:00
5f5f215aad Merge pull request 'switch to smarter ci cache, which knows intricacies of rust; e.g. auto deletes unused deps' (#434) from smarter-ci-cache into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 7m54s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 17m31s
Reviewed-on: #434
2024-04-24 12:04:26 +02:00
a2b0146d6d fix ci
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m45s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-24 11:57:26 +02:00
7f813823f3 switch to smarter ci cache, which knows intricacies of rust; e.g. auto deletes unused deps
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m3s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-24 10:14:11 +02:00
d91baeb7bc Merge branch 'staging' into handoperatable-feature
Some checks failed
CI/CD Pipeline / test (push) Failing after 11m24s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-24 09:56:47 +02:00
b5cdc8827a Merge pull request 'format-tera' (#429) from format-tera into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 14m7s
CI/CD Pipeline / deploy-staging (push) Successful in 7m15s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #429
2024-04-24 09:47:57 +02:00
b6b88ead37 Merge branch 'staging' into format-tera
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-04-24 09:46:54 +02:00
6b3851bfe4 Merge pull request 'format tera w/ linter' (#430) from format-tera into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 14m0s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 7m19s
Reviewed-on: #430
2024-04-24 09:46:19 +02:00
a0dbd0f490 implement first draft of switching handoperatable boats
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-04-24 09:37:45 +02:00
3f80cb498c format tera w/ linter
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-04-24 08:57:41 +02:00
7ba5070df3 Merge pull request 'group-reservations-in-log' (#426) from group-reservations-in-log into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m22s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 7m1s
Reviewed-on: #426
2024-04-24 08:53:52 +02:00
cc1a7106cb Merge pull request 'group-reservations-in-log' (#425) from group-reservations-in-log into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m51s
CI/CD Pipeline / deploy-staging (push) Successful in 7m5s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #425
2024-04-24 08:51:38 +02:00
d4218289f0 fix ci
All checks were successful
CI/CD Pipeline / test (push) Successful in 22m5s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-24 08:27:54 +02:00
349a9f843c fix ci
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-04-24 07:39:44 +02:00
982bb3b5c8 Merge pull request 'fix ci' (#428) from fix-ci into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m30s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 7m30s
Reviewed-on: #428
2024-04-24 07:21:34 +02:00
b4f38089ee Merge pull request 'fix-ci' (#427) from fix-ci into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 14m21s
CI/CD Pipeline / deploy-staging (push) Successful in 7m25s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #427
2024-04-24 07:20:50 +02:00
e22dd8eb51 fix ci
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-04-24 07:20:16 +02:00
ac9c4b256e Merge pull request 'allow-reservation-edits' (#424) from allow-reservation-edits into main
Some checks failed
CI/CD Pipeline / test (push) Failing after 6m2s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #424
2024-04-23 23:23:10 +02:00
cfec4ef8b3 Merge branch 'main' into allow-reservation-edits
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-04-23 23:10:02 +02:00
a424e79cba Merge pull request 'allow-reservation-edits' (#423) from allow-reservation-edits into staging
Some checks failed
CI/CD Pipeline / test (push) Failing after 6m7s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #423
2024-04-23 23:05:47 +02:00
Marie Birner
be24001b4b Merge branch 'allow-reservation-edits' into staging
Some checks are pending
CI/CD Pipeline / test (push) Waiting to run
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
# Conflicts:
#	src/tera/boatreservation.rs
2024-04-23 23:04:46 +02:00