2153 Commits

Author SHA1 Message Date
c13dfdaa77 Merge pull request 'fix spacing in roles' () from fix-spacing into main
Reviewed-on: 
2024-07-28 07:14:29 +02:00
0bc9e11b9a fix spacing in roles 2024-07-28 07:13:21 +02:00
2fdcab9030 Merge pull request 'allow instand logbook add' () from fix-instand-add into main
Reviewed-on: 
2024-07-27 20:49:30 +02:00
b43682ac39 allow instand logbook add 2024-07-27 20:48:32 +02:00
958dda9f52 Merge pull request 'don't allow to finalize a logbook entry more than once' () from only-allow-finalizing-logbook-once into main
Reviewed-on: 
2024-07-26 10:34:57 +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 :-)' () from fix into main
Reviewed-on: 
2024-07-24 09:25:19 +02:00
afa88b9529 one more error fix :-) 2024-07-24 09:24:26 +02:00
4229a4e021 Merge pull request 'use proper role name' () from fix into main
Reviewed-on: 
2024-07-24 08:46:40 +02:00
f6207e2994 use proper role name 2024-07-24 08:45:52 +02:00
4da996251a Merge pull request 'better logs' () from update-logbook-entries into main
Reviewed-on: 
2024-07-23 15:15:16 +02:00
aa9568f326 better logs 2024-07-23 15:13:36 +02:00
1db09cd8ac Merge pull request 'update logbook entries' () from update-logbook-entries into main
Reviewed-on: 
2024-07-23 15:04:52 +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' () from new-text into main
Reviewed-on: 
2024-07-23 08:59:05 +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 ' () from halfprice-fee into main
Reviewed-on: 
2024-07-22 21:59:36 +02:00
b1252e8d5c fix empty but non-null date entries 2024-07-22 21:56:47 +02:00
a62fd116ea show halfprice for member fees if entry_year == current_year && start_date >= 1.7. Fixes 2024-07-22 21:35:07 +02:00
622bc700f3 Merge pull request '[TASK] quick restructure of user screen' () from restructure-user into main
Reviewed-on: 
2024-07-16 17:39:05 +02:00
0e5fd25e61 format tera files 2024-07-16 16:38:12 +01: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' () from fix-steering-only-boat-logentry into main
Reviewed-on: 
2024-07-13 21:16:05 +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' () from more-robust-data-fetching into main
Reviewed-on: 
2024-07-10 09:45:15 +02:00
ce8a095b31 more robust data fetching 2024-07-10 09:44:38 +02:00
6c191cf59e Merge pull request 'fix term' () from fix-term into main
Reviewed-on: 
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' () from order-logbook-by-arrival into main
Reviewed-on: 
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' () from update-deps into main
Reviewed-on: 
2024-06-27 07:59:27 +02:00
3543ffe9e1 update deps 2024-06-27 07:58:30 +02:00
1ad6509568 minor visual improvements 2024-06-24 19:56:35 +02:00
Marie Birner
dba1e08c5d [TASK] quick restructure of user screen 2024-06-24 16:58:19 +02:00
1dc0c9c0e1 Merge pull request 'update iban' () from update-iban into main
Reviewed-on: 
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' () from allow-vorstand-to-send-things into main
Reviewed-on: 
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' () from allow-vorstand-to-send-things into main
Reviewed-on: 
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' () from update-deps into main
Reviewed-on: 
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' () from fix-migration into main
Reviewed-on: 
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 :-)' () from more-sympatic-welcome-mail into main
Reviewed-on: 
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