2460 Commits

Author SHA1 Message Date
26aa222bc6 Merge pull request 'fix-spacing' (#651) from fix-spacing into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#651
2024-07-28 07:14:07 +02:00
0bc9e11b9a fix spacing in roles 2024-07-28 07:13:21 +02:00
2fdcab9030 Merge pull request 'allow instand logbook add' (#649) from fix-instand-add into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#649
2024-07-27 20:49:30 +02:00
7689a39ac5 Merge pull request 'allow instand logbook add' (#648) from fix-instand-add into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#648
2024-07-27 20:49:22 +02:00
b43682ac39 allow instand logbook add 2024-07-27 20:48:32 +02:00
8d7a1c707d Merge pull request 'Merge pull request 'don't allow to finalize a logbook entry more than once' (#644) from only-allow-finalizing-logbook-once into main' (#647) from fix-instand-add into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#647
2024-07-27 20:47:00 +02:00
958dda9f52 Merge pull request 'don't allow to finalize a logbook entry more than once' (#644) from only-allow-finalizing-logbook-once into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#644
2024-07-26 10:34:57 +02:00
1eea8c9662 Merge pull request 'only-allow-finalizing-logbook-once' (#643) from only-allow-finalizing-logbook-once into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#643
2024-07-26 10:34:51 +02:00
b4b922222c don't allow to finalize a logbook entry more than once 2024-07-26 10:34:14 +02:00
84e76e8d65 Merge pull request 'one more error fix :-)' (#642) from fix into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#642
2024-07-24 09:25:19 +02:00
bdfcc6bc0a Merge pull request 'one more error fix :-)' (#641) from fix into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#641
2024-07-24 09:25:10 +02:00
afa88b9529 one more error fix :-) 2024-07-24 09:24:26 +02:00
4229a4e021 Merge pull request 'use proper role name' (#640) from fix into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#640
2024-07-24 08:46:40 +02:00
6cd555298d Merge pull request 'fix' (#639) from fix into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#639
2024-07-24 08:46:34 +02:00
f6207e2994 use proper role name 2024-07-24 08:45:52 +02:00
4da996251a Merge pull request 'better logs' (#637) from update-logbook-entries into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#637
2024-07-23 15:15:16 +02:00
c44c0d8505 Merge pull request 'better logs' (#636) from update-logbook-entries into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#636
2024-07-23 15:14:50 +02:00
aa9568f326 better logs 2024-07-23 15:13:36 +02:00
1db09cd8ac Merge pull request 'update logbook entries' (#634) from update-logbook-entries into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#634
2024-07-23 15:04:52 +02:00
59ef93d6fa Merge pull request 'update-logbook-entries' (#633) from update-logbook-entries into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#633
2024-07-23 15:04:47 +02:00
4a3ee5b551 update logbook entries 2024-07-23 14:57:09 +02:00
c73b3e94c3 Merge pull request 'new text to make clear who's responsible for fee payment' (#632) from new-text into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#632
2024-07-23 08:59:05 +02:00
4969a0d90a Merge pull request 'new-text' (#631) from new-text into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#631
2024-07-23 08:58:59 +02:00
3efcd99bbc new text to make clear who's responsible for fee payment 2024-07-23 08:57:43 +02:00
4f0f509ad6 Merge pull request 'show halfprice for member fees if entry_year == current_year && start_date >= 1.7. Fixes #616' (#629) from halfprice-fee into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#629
2024-07-22 21:59:36 +02:00
8112f1ed2a Merge pull request 'fix empty but non-null date entries' (#630) from halfprice-fee into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#630
2024-07-22 21:57:30 +02:00
b1252e8d5c fix empty but non-null date entries 2024-07-22 21:56:47 +02:00
9cb9cfe2a1 Merge pull request 'show halfprice for member fees if entry_year == current_year && start_date >= 1.7. Fixes #616' (#628) from halfprice-fee into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#628
2024-07-22 21:36:05 +02:00
a62fd116ea show halfprice for member fees if entry_year == current_year && start_date >= 1.7. Fixes #616 2024-07-22 21:35:07 +02:00
622bc700f3 Merge pull request '[TASK] quick restructure of user screen' (#607) from restructure-user into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#607
2024-07-16 17:39:05 +02:00
2540a3dc7c Merge pull request 'format tera files' (#627) from restructure-user into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#627
2024-07-16 17:38:48 +02:00
0e5fd25e61 format tera files 2024-07-16 16:38:12 +01:00
72b86d4dad Merge pull request 'restructure-user' (#626) from restructure-user into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#626
2024-07-16 17:32:38 +02:00
Marie Birner
16fbeea81b [BUGFIX] only-event.png 2024-07-16 14:38:27 +02:00
Marie Birner
bd6fbe772e [BUGFIX] vorstand-no-admin.png 2024-07-16 14:32:40 +02:00
647970e1fc Merge pull request 'fix-steering-only-boat-logentry' (#624) from fix-steering-only-boat-logentry into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#624
2024-07-13 21:16:05 +02:00
1e1c1bb6d9 Merge pull request 'fix-steering-only-boat-logentry' (#623) from fix-steering-only-boat-logentry into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#623
2024-07-13 21:14:28 +02:00
088fe98995 fix test 2024-07-13 20:03:10 +01:00
4237fafdff fix error, where log entries can't be added with boats with only steering 2024-07-13 19:58:13 +01:00
6b24008c17 Merge pull request 'more robust data fetching' (#618) from more-robust-data-fetching into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#618
2024-07-10 09:45:15 +02:00
4fbd3c7717 Merge pull request 'more robust data fetching' (#617) from more-robust-data-fetching into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#617
2024-07-10 09:45:01 +02:00
ce8a095b31 more robust data fetching 2024-07-10 09:44:38 +02:00
6c191cf59e Merge pull request 'fix term' (#615) from fix-term into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#615
2024-06-27 17:11:15 +02:00
b0698e70a4 Merge pull request 'fix term' (#614) from fix-term into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#614
2024-06-27 17:10:53 +02:00
6f7283f754 fix term 2024-06-27 17:10:15 +02:00
323f721fc0 Merge pull request 'order logbook by arrival' (#612) from order-logbook-by-arrival into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#612
2024-06-27 08:52:22 +02:00
d0bcf1f384 Merge pull request 'order logbook by arrival' (#611) from order-logbook-by-arrival into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#611
2024-06-27 08:52:17 +02:00
bd7cd0020e order logbook by arrival 2024-06-27 08:51:44 +02:00
22bfe48d18 Merge pull request 'update deps' (#610) from update-deps into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#610
2024-06-27 07:59:27 +02:00
c379a6ca79 Merge pull request 'update deps' (#609) from update-deps into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#609
2024-06-27 07:59:15 +02:00