Commit Graph

1901 Commits

Author SHA1 Message Date
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
Marie Birner
d9885f9bba [TASK] change padding form
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
2024-04-23 22:58:48 +02:00
Marie Birner
6c2e0669d5 [TASK] improve sorting boats in schnellauswahl
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-23 22:46:05 +02:00
Marie Birner
e556b1375d [TASK] improve styling boat list
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-23 22:39:59 +02:00
Marie Birner
23a623bdc9 [TASK] add etsch edge case js
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
2024-04-23 22:36:51 +02:00
Marie Birner
b1d48a5154 [TASK] improve sidebar css 2024-04-23 22:35:52 +02:00
61261c9816 allow edits of boatreservations, Fixes #417
All checks were successful
CI/CD Pipeline / test (push) Successful in 21m39s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-23 22:23:24 +02:00
f993eae27f Merge pull request 'add script to fetch current db' (#422) from fetch-db-script into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m56s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 7m39s
Reviewed-on: #422
2024-04-23 21:12:37 +02:00
f1ee266288 Merge pull request 'add script to fetch current db' (#421) from fetch-db-script into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m53s
CI/CD Pipeline / deploy-staging (push) Successful in 6m56s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #421
2024-04-23 21:12:14 +02:00
9aefc814a7 Merge pull request '[TASK] group reservations in log to avoid near-duplicates' (#420) from group-reservations-in-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: #420
2024-04-23 21:11:42 +02:00
548c025fbc Merge pull request '[TASK] group reservations in log to avoid near-duplicates' (#419) from group-reservations-in-log 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
Reviewed-on: #419
2024-04-23 21:11:18 +02:00
8f44fdadf2 add script to fetch current db
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-23 21:10:04 +02:00
3abff08f61 [TASK] group reservations in log to avoid near-duplicates
All checks were successful
CI/CD Pipeline / test (push) Successful in 21m22s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-23 20:40:06 +02:00
32dee2c320 Merge pull request 'allow to upload membership pdf for users which don't have it' (#416) from allow-membership-uploads into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m49s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 6m48s
Reviewed-on: #416
2024-04-22 10:37:49 +02:00
3c67e0deeb Merge pull request 'allow to upload membership pdf for users which don't have it' (#415) from allow-membership-uploads into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m35s
CI/CD Pipeline / deploy-staging (push) Successful in 7m26s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #415
2024-04-22 10:37:09 +02:00
ef21e719c8 allow to upload membership pdf for users which don't have it
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-22 10:36:47 +02:00
4a7cd2f085 Merge pull request 'update deps' (#414) from update-deps into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m5s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 7m0s
Reviewed-on: #414
2024-04-19 16:38:31 +02:00
27b124cce5 Merge pull request 'update deps' (#413) from update-deps into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 29m46s
CI/CD Pipeline / deploy-staging (push) Successful in 23m47s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #413
2024-04-19 16:38:23 +02:00