2352 Commits

Author SHA1 Message Date
96036b180b Merge pull request 'allow-scheckbuch-to-be-entered' () from allow-scheckbuch-to-be-entered into staging
Reviewed-on: 
2024-05-01 19:37:09 +02:00
8c563a9c36 allow scheckbuch people to be entered in logbook 2024-05-01 19:27:52 +02:00
b70929c5ce Merge pull request 'clippy :-)' () from clippy into main
Reviewed-on: 
2024-04-30 22:26:09 +02:00
c98f33e138 Merge pull request 'clippy :-)' () from clippy into staging
Reviewed-on: 
2024-04-30 22:26:04 +02:00
17d1ee3566 clippy :-) 2024-04-30 21:35:14 +02:00
a75ba765df Merge pull request 'don't use default distance of 11; don't overwrite distance if already entered' () from logbook-entry-improvement into main
Reviewed-on: 
2024-04-30 21:31:33 +02:00
1503544a73 Merge pull request 'don't use default distance of 11; don't overwrite distance if already entered' () from logbook-entry-improvement into staging
Reviewed-on: 
2024-04-30 21:31:29 +02:00
0b350d344d don't use default distance of 11; don't overwrite distance if already entered 2024-04-30 21:21:01 +02:00
67c8431157 Merge pull request 'better phrasing' () from show-waterlevel into staging
Reviewed-on: 
2024-04-30 17:04:45 +02:00
d6ecd87593 better phrasing 2024-04-30 17:02:22 +02:00
03073965a1 Merge pull request 'use recommended method of 'sleep'' () from show-waterlevel into staging
Reviewed-on: 
2024-04-30 15:56:47 +02:00
2189b082c0 use recommended method of 'sleep' 2024-04-30 15:56:21 +02:00
6d4bc81720 Merge pull request 'remove unnecessary async' () from show-waterlevel into staging
Reviewed-on: 
2024-04-30 15:48:45 +02:00
25fe4c23ef remove unnecessary async 2024-04-30 15:47:40 +02:00
2fdfddbd2e Merge pull request 'add tooltip + link' () from show-waterlevel into staging
Reviewed-on: 
2024-04-30 15:14:26 +02:00
dea6520aa9 add tooltip + link 2024-04-30 15:13:42 +02:00
f8e0cd2d5b Merge pull request 'deployed :-)' () from show-waterlevel into staging
Reviewed-on: 
2024-04-30 14:35:45 +02:00
9fda9cbde2 deployed :-) 2024-04-30 14:35:30 +02:00
74b24569dd Merge pull request 'show-waterlevel' () from show-waterlevel into staging
Reviewed-on: 
2024-04-30 13:06:08 +02:00
3a39315a01 show waterlevel for the next days 2024-04-30 11:59:33 +02:00
3323807e46 Merge pull request 'no boat is selected by default in the logbook -> users don't accidentally 'select' external boat' () from no-boat-selected-by-default-in-logbook into main
Reviewed-on: 
2024-04-29 22:30:29 +02:00
65d51c2cc2 Merge pull request 'no-boat-selected-by-default-in-logbook' () from no-boat-selected-by-default-in-logbook into staging
Reviewed-on: 
2024-04-29 22:30:24 +02:00
8773bbb9d1 Merge branch 'main' into no-boat-selected-by-default-in-logbook 2024-04-29 22:29:52 +02:00
89ac4974db Merge pull request 'rephrase scheckbuch button' () from rephrase-scheckbuch-button into main
Reviewed-on: 
2024-04-29 22:29:16 +02:00
7dfdc55adb Merge pull request 'rephrase-scheckbuch-button' () from rephrase-scheckbuch-button into staging
Reviewed-on: 
2024-04-29 22:29:12 +02:00
e4f1528b15 fix ci; proper click @ boat selector 2024-04-29 22:17:40 +02:00
c449e878f0 rephrase scheckbuch button 2024-04-29 21:51:27 +02:00
311e611d5f no boat is selected by default in the logbook -> users don't accidentally 'select' external boat 2024-04-29 21:40:35 +02:00
8e5661b2f3 Merge pull request 'treat empty membership pdf as non-existing' () from treat-empty-membershippdf-as-nonexisting into main
Reviewed-on: 
2024-04-29 21:33:49 +02:00
79976b751f Merge pull request 'treat empty membership pdf as non-existing' () from treat-empty-membershippdf-as-nonexisting into staging
Reviewed-on: 
2024-04-29 21:33:44 +02:00
139acb2ec5 treat empty membership pdf as non-existing 2024-04-29 21:10:34 +02:00
5dcd7bc745 Merge pull request 'proper-time-in-notificatoins' () from proper-time-in-notificatoins into main
Reviewed-on: 
2024-04-29 09:18:58 +02:00
ebdfe37bec Merge pull request 'proper-time-in-notificatoins' () from proper-time-in-notificatoins into staging
Reviewed-on: 
2024-04-29 09:18:55 +02:00
08fe779403 remove debug println 2024-04-29 08:48:43 +02:00
9ca510b892 show proper time in notifications 2024-04-29 08:48:15 +02:00
d01895df90 Merge pull request 'don't respond with 500 if no rower is selected' () from require-user-for-logentry into main
Reviewed-on: 
2024-04-28 19:25:33 +02:00
f08d9728eb Merge pull request 'require-user-for-logentry' () from require-user-for-logentry into staging
Reviewed-on: 
2024-04-28 19:25:27 +02:00
c27a2ad15e don't respond with 500 if no rower is selected 2024-04-28 19:16:38 +02:00
18047d16bf Merge pull request 'fix spacing if boat was steered by hand' () from fix-spacing into main
Reviewed-on: 
2024-04-26 10:07:03 +02:00
1866034431 Merge pull request 'fix-spacing' () from fix-spacing into staging
Reviewed-on: 
2024-04-26 10:07:00 +02:00
e2306e890d Merge pull request 'if user is logged in, use that user as default rower' () from prefill-own-user-default-log into main
Reviewed-on: 
2024-04-26 09:59:09 +02:00
688ce4c6fc Merge pull request 'prefill-own-user-default-log' () from prefill-own-user-default-log into staging
Reviewed-on: 
2024-04-26 09:59:02 +02:00
46f8ca230a fix spacing if boat was steered by hand 2024-04-26 09:54:24 +02:00
fcf86c7ff1 if user is logged in, use that user as default rower 2024-04-26 09:50:01 +02:00
123b4bd39f Merge pull request 'no-special-treatment-with-boatname' () from no-special-treatment-with-boatname into main
Reviewed-on: 
2024-04-24 17:23:49 +02:00
7a8b79ccef Merge pull request 'no-special-treatment-with-boatname' () from no-special-treatment-with-boatname into staging
Reviewed-on: 
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' () from log-handle-external-boats into main
Reviewed-on: 
2024-04-24 17:03:44 +02:00
5bb0cb4112 Merge pull request 'log-handle-external-boats' () from log-handle-external-boats into staging
Reviewed-on: 
2024-04-24 17:03:41 +02:00