2123 Commits

Author SHA1 Message Date
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
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
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
3543ffe9e1 update deps 2024-06-27 07:58:30 +02:00
1dc0c9c0e1 Merge pull request 'update iban' (#605) from update-iban into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#605
2024-06-24 15:03:54 +02:00
3dff956544 update iban 2024-06-24 15:02:55 +02:00
79f8efc34b Merge pull request 'allow vorstand to send mail + notifications' (#603) from allow-vorstand-to-send-things into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#603
2024-06-21 11:25:27 +02:00
3e983e05f9 allow vorstand to send mail + notifications 2024-06-21 11:24:14 +02:00
8f91cc4e88 Merge pull request 'allow vorstand to send mail + notifications' (#601) from allow-vorstand-to-send-things into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#601
2024-06-21 11:15:37 +02:00
76290a64ae allow vorstand to send mail + notifications 2024-06-21 11:14:48 +02:00
4b48fbaa82 Merge pull request 'update deps' (#599) from update-deps into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#599
2024-06-19 13:44:08 +02:00
def8affb5f update deps 2024-06-19 13:43:04 +02:00
dfa7be9928 Merge pull request 'fix migration' (#597) from fix-migration into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#597
2024-06-16 20:15:58 +02:00
2159696112 fix migration test 2024-06-16 20:00:44 +02:00
1c04462c30 Merge pull request 'add more life to the mails :-)' (#595) from more-sympatic-welcome-mail into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#595
2024-06-15 18:28:24 +02:00
b2393eb6ec mb is too serious 2024-06-15 18:27:09 +02:00
a5e82851ba fix missing word 2024-06-10 22:23:26 +02:00
80725e223b add more life to the mails :-) 2024-06-10 22:17:41 +02:00
39bde35864 Merge pull request 'add wifi pw in welcome mail' (#593) from add-wifi-pw-new-members into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#593
2024-06-10 22:08:18 +02:00
5f301324ee add wifi pw in welcome mail 2024-06-10 22:07:14 +02:00
9558965e8f Merge pull request 'require necessary fields' (#591) from require-necessary-fields into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#591
2024-06-10 20:59:43 +02:00
5f4d8982a8 require necessary fields 2024-06-10 20:58:42 +02:00
0e2ef9e256 Merge pull request 'add trailer reservation funcitonality; Fixes #443' (#588) from trailer-reservation into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#588
2024-06-10 20:00:25 +02:00
1dc91f4f28 merged :-) 2024-06-10 19:59:39 +02:00
f56da43723 fix copied stuff 2024-06-10 19:48:16 +02:00
9dc1ec6fa0 add trailer reservation funcitonality; Fixes #443 2024-06-10 19:43:59 +02:00
c9b67f5790 Merge pull request 'add delete trip button in edit window; Fixes #449' (#586) from delte-trip-btn into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#586
2024-06-10 19:08:22 +02:00
16687e39ab remove unused attribute 2024-06-10 19:07:55 +02:00
957c474389 add delete trip button in edit window; Fixes #449 2024-06-10 19:07:05 +02:00
f7aed68423 Merge pull request 'show if a user has < 30 km to thousand km trip, Fixes #551' (#582) from thousand-km-trips into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#582
2024-06-10 15:50:31 +02:00
01637d0800 Merge pull request 'use proper hydro license; add fluctuation' (#584) from proper-hydro into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#584
2024-06-10 15:49:51 +02:00
0a77011170 use proper hydro license; add fluctuation 2024-06-10 15:48:49 +02:00
dea0c65da3 fix ci + add test 2024-06-10 15:12:23 +02:00
31bf38f112 show if a user has < 30 km to thousand km trip, Fixes #551 2024-06-10 14:55:01 +02:00
6b29907596 Merge pull request 'fix boat select' (#580) from fix-boat-select into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#580
2024-06-10 11:01:47 +02:00
7b17c30ce2 fix boat select 2024-06-10 11:00:54 +02:00
ec4068e499 Merge pull request 'cleaner cal' (#578) from cleaner-cal into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#578
2024-06-06 17:22:14 +02:00
fca19745f8 even nicer cal entries 2024-06-06 17:21:55 +02:00
bb48ddb3de fix ci 2024-06-06 17:17:40 +02:00
34b098fa2a cleaner cal 2024-06-06 17:16:47 +02:00
df1a06531f Merge pull request 'try new badge :-)' (#576) from add-badge into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#576
2024-06-06 10:48:51 +02:00
7b499fb457 try new badge :-) 2024-06-06 10:38:18 +02:00
d00570ff2f Merge pull request 'nicer-cal' (#574) from nicer-cal into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#574
2024-06-06 07:11:43 +02:00
bd63f2c386 use new additional information in test 2024-06-06 06:59:41 +02:00
e1b78b2725 don't lose trip_type on event cancellation; don't add empty notes in cal 2024-06-06 06:57:43 +02:00
fa14cfbf83 add cancellation, trip_type and notes to cal export 2024-06-06 06:47:41 +02:00
5f6cb9a12b Merge pull request 'update deps' (#572) from update-deps into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#572
2024-06-05 15:07:08 +02:00
1cac70cabb update deps 2024-06-05 14:57:28 +02:00