2258 Commits

Author SHA1 Message Date
123b4bd39f Merge pull request 'no-special-treatment-with-boatname' (#442) from no-special-treatment-with-boatname into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#442
2024-04-24 17:23:49 +02:00
7a8b79ccef Merge pull request 'no-special-treatment-with-boatname' (#441) from no-special-treatment-with-boatname into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#441
2024-04-24 17:23:46 +02:00
5eadfd42bb don't show link if the user has no permission 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
Reviewed-on: Ruderverein-Donau-Linz/rowt#440
2024-04-24 17:03:44 +02:00
5bb0cb4112 Merge pull request 'log-handle-external-boats' (#439) from log-handle-external-boats into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#439
2024-04-24 17:03:41 +02:00
237377dc05 easier handling of external boats, show all in separate category 2024-04-24 16:56:48 +02:00
fc7ca28f56 Merge pull request 'fix-ci-db' (#438) from fix-ci-db into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#438
2024-04-24 16:41:02 +02:00
6a18d7435a Merge pull request 'fix-ci-db' (#437) from fix-ci-db into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#437
2024-04-24 15:58:18 +02:00
a42191715d fix ci 2024-04-24 15:56:40 +02:00
43e073c54e calc general boat cat (#436)
Reviewed-on: Ruderverein-Donau-Linz/rowt#436
2024-04-24 15:39:13 +02:00
14e7616b88 calc-general-boatcat (#435)
Reviewed-on: Ruderverein-Donau-Linz/rowt#435
2024-04-24 15:39:07 +02:00
8e03c935a5 fix ci 2024-04-24 15:32:33 +02:00
0560ed7a6a fix ci 2024-04-24 15:29:52 +02:00
07b197cc63 check changing of handoperated in backend 2024-04-24 15:25:42 +02:00
a1ebd59f22 calc general boat cat 2024-04-24 15:12:27 +02:00
aac7444896 Merge pull request 'handoperatable-feature' (#432) from handoperatable-feature into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#432
2024-04-24 14:43:24 +02:00
d646996c80 Merge branch 'main' into handoperatable-feature 2024-04-24 12:21:07 +02:00
1412852087 Merge pull request 'handoperatable-feature' (#431) from handoperatable-feature into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#431
2024-04-24 12:19:06 +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
Reviewed-on: Ruderverein-Donau-Linz/rowt#434
2024-04-24 12:04:26 +02:00
7a59c67763 Merge pull request 'smarter-ci-cache' (#433) from smarter-ci-cache into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#433
2024-04-24 12:04:22 +02:00
a2b0146d6d fix ci 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 2024-04-24 10:14:11 +02:00
d91baeb7bc Merge branch 'staging' into handoperatable-feature 2024-04-24 09:56:47 +02:00
b5cdc8827a Merge pull request 'format-tera' (#429) from format-tera into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#429
2024-04-24 09:47:57 +02:00
b6b88ead37 Merge branch 'staging' into format-tera 2024-04-24 09:46:54 +02:00
6b3851bfe4 Merge pull request 'format tera w/ linter' (#430) from format-tera into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#430
2024-04-24 09:46:19 +02:00
a0dbd0f490 implement first draft of switching handoperatable boats 2024-04-24 09:37:45 +02:00
3f80cb498c format tera w/ linter 2024-04-24 08:57:41 +02:00
7ba5070df3 Merge pull request 'group-reservations-in-log' (#426) from group-reservations-in-log into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#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
Reviewed-on: Ruderverein-Donau-Linz/rowt#425
2024-04-24 08:51:38 +02:00
d4218289f0 fix ci 2024-04-24 08:27:54 +02:00
349a9f843c fix ci 2024-04-24 07:39:44 +02:00
982bb3b5c8 Merge pull request 'fix ci' (#428) from fix-ci into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#428
2024-04-24 07:21:34 +02:00
b4f38089ee Merge pull request 'fix-ci' (#427) from fix-ci into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#427
2024-04-24 07:20:50 +02:00
e22dd8eb51 fix ci 2024-04-24 07:20:16 +02:00
ac9c4b256e Merge pull request 'allow-reservation-edits' (#424) from allow-reservation-edits into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#424
2024-04-23 23:23:10 +02:00
cfec4ef8b3 Merge branch 'main' into allow-reservation-edits 2024-04-23 23:10:02 +02:00
a424e79cba Merge pull request 'allow-reservation-edits' (#423) from allow-reservation-edits into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#423
2024-04-23 23:05:47 +02:00
Marie Birner
be24001b4b Merge branch 'allow-reservation-edits' into staging
# Conflicts:
#	src/tera/boatreservation.rs
2024-04-23 23:04:46 +02:00
Marie Birner
d9885f9bba [TASK] change padding form 2024-04-23 22:58:48 +02:00
Marie Birner
6c2e0669d5 [TASK] improve sorting boats in schnellauswahl 2024-04-23 22:46:05 +02:00
Marie Birner
e556b1375d [TASK] improve styling boat list 2024-04-23 22:39:59 +02:00
Marie Birner
23a623bdc9 [TASK] add etsch edge case js 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 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
Reviewed-on: Ruderverein-Donau-Linz/rowt#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
Reviewed-on: Ruderverein-Donau-Linz/rowt#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
Reviewed-on: Ruderverein-Donau-Linz/rowt#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
Reviewed-on: Ruderverein-Donau-Linz/rowt#419
2024-04-23 21:11:18 +02:00