Commit Graph

  • 96036b180b Merge pull request 'allow-scheckbuch-to-be-entered' (#476) from allow-scheckbuch-to-be-entered into staging philipp 2024-05-01 19:37:09 +02:00
  • 8c563a9c36 allow scheckbuch people to be entered in logbook philipp 2024-05-01 19:27:52 +02:00
  • b70929c5ce Merge pull request 'clippy :-)' (#475) from clippy into main philipp 2024-04-30 22:26:09 +02:00
  • c98f33e138 Merge pull request 'clippy :-)' (#474) from clippy into staging philipp 2024-04-30 22:26:04 +02:00
  • 17d1ee3566 clippy :-) philipp 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' (#473) from logbook-entry-improvement into main philipp 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' (#472) from logbook-entry-improvement into staging philipp 2024-04-30 21:31:29 +02:00
  • 0b350d344d don't use default distance of 11; don't overwrite distance if already entered philipp 2024-04-30 21:21:01 +02:00
  • 67c8431157 Merge pull request 'better phrasing' (#471) from show-waterlevel into staging philipp 2024-04-30 17:04:45 +02:00
  • d6ecd87593 better phrasing philipp 2024-04-30 17:02:22 +02:00
  • 03073965a1 Merge pull request 'use recommended method of 'sleep'' (#470) from show-waterlevel into staging philipp 2024-04-30 15:56:47 +02:00
  • 2189b082c0 use recommended method of 'sleep' philipp 2024-04-30 15:56:21 +02:00
  • 6d4bc81720 Merge pull request 'remove unnecessary async' (#469) from show-waterlevel into staging philipp 2024-04-30 15:48:45 +02:00
  • 25fe4c23ef remove unnecessary async philipp 2024-04-30 15:47:40 +02:00
  • 2fdfddbd2e Merge pull request 'add tooltip + link' (#468) from show-waterlevel into staging philipp 2024-04-30 15:14:26 +02:00
  • dea6520aa9 add tooltip + link philipp 2024-04-30 15:13:42 +02:00
  • f8e0cd2d5b Merge pull request 'deployed :-)' (#467) from show-waterlevel into staging philipp 2024-04-30 14:35:45 +02:00
  • 9fda9cbde2 deployed :-) philipp 2024-04-30 14:35:30 +02:00
  • 74b24569dd Merge pull request 'show-waterlevel' (#465) from show-waterlevel into staging philipp 2024-04-30 13:06:08 +02:00
  • 3a39315a01 show waterlevel for the next days philipp 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' (#459) from no-boat-selected-by-default-in-logbook into main philipp 2024-04-29 22:30:29 +02:00
  • 65d51c2cc2 Merge pull request 'no-boat-selected-by-default-in-logbook' (#458) from no-boat-selected-by-default-in-logbook into staging philipp 2024-04-29 22:30:24 +02:00
  • 8773bbb9d1 Merge branch 'main' into no-boat-selected-by-default-in-logbook philipp 2024-04-29 22:29:52 +02:00
  • 89ac4974db Merge pull request 'rephrase scheckbuch button' (#461) from rephrase-scheckbuch-button into main philipp 2024-04-29 22:29:16 +02:00
  • 7dfdc55adb Merge pull request 'rephrase-scheckbuch-button' (#460) from rephrase-scheckbuch-button into staging philipp 2024-04-29 22:29:12 +02:00
  • e4f1528b15 fix ci; proper click @ boat selector philipp 2024-04-29 22:17:40 +02:00
  • c449e878f0 rephrase scheckbuch button philipp 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 philipp 2024-04-29 21:40:35 +02:00
  • 8e5661b2f3 Merge pull request 'treat empty membership pdf as non-existing' (#457) from treat-empty-membershippdf-as-nonexisting into main philipp 2024-04-29 21:33:49 +02:00
  • 79976b751f Merge pull request 'treat empty membership pdf as non-existing' (#456) from treat-empty-membershippdf-as-nonexisting into staging philipp 2024-04-29 21:33:44 +02:00
  • 139acb2ec5 treat empty membership pdf as non-existing philipp 2024-04-29 21:10:34 +02:00
  • 5dcd7bc745 Merge pull request 'proper-time-in-notificatoins' (#453) from proper-time-in-notificatoins into main philipp 2024-04-29 09:18:58 +02:00
  • ebdfe37bec Merge pull request 'proper-time-in-notificatoins' (#452) from proper-time-in-notificatoins into staging philipp 2024-04-29 09:18:55 +02:00
  • 08fe779403 remove debug println philipp 2024-04-29 08:48:43 +02:00
  • 9ca510b892 show proper time in notifications philipp 2024-04-29 08:48:15 +02:00
  • d01895df90 Merge pull request 'don't respond with 500 if no rower is selected' (#451) from require-user-for-logentry into main philipp 2024-04-28 19:25:33 +02:00
  • f08d9728eb Merge pull request 'require-user-for-logentry' (#450) from require-user-for-logentry into staging philipp 2024-04-28 19:25:27 +02:00
  • c27a2ad15e don't respond with 500 if no rower is selected philipp 2024-04-28 19:16:38 +02:00
  • 18047d16bf Merge pull request 'fix spacing if boat was steered by hand' (#447) from fix-spacing into main philipp 2024-04-26 10:07:03 +02:00
  • 1866034431 Merge pull request 'fix-spacing' (#446) from fix-spacing into staging philipp 2024-04-26 10:07:00 +02:00
  • e2306e890d Merge pull request 'if user is logged in, use that user as default rower' (#445) from prefill-own-user-default-log into main philipp 2024-04-26 09:59:09 +02:00
  • 688ce4c6fc Merge pull request 'prefill-own-user-default-log' (#444) from prefill-own-user-default-log into staging philipp 2024-04-26 09:59:02 +02:00
  • 46f8ca230a fix spacing if boat was steered by hand philipp 2024-04-26 09:54:24 +02:00
  • fcf86c7ff1 if user is logged in, use that user as default rower philipp 2024-04-26 09:50:01 +02:00
  • 123b4bd39f Merge pull request 'no-special-treatment-with-boatname' (#442) from no-special-treatment-with-boatname into main philipp 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 philipp 2024-04-24 17:23:46 +02:00
  • 5eadfd42bb don't show link if the user has no permission philipp 2024-04-24 17:18:57 +02:00
  • 87307378c6 no special treatment for 'externes boot' philipp 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 philipp 2024-04-24 17:03:44 +02:00
  • 5bb0cb4112 Merge pull request 'log-handle-external-boats' (#439) from log-handle-external-boats into staging philipp 2024-04-24 17:03:41 +02:00
  • 237377dc05 easier handling of external boats, show all in separate category philipp 2024-04-24 16:56:48 +02:00
  • fc7ca28f56 Merge pull request 'fix-ci-db' (#438) from fix-ci-db into main philipp 2024-04-24 16:41:02 +02:00
  • 6a18d7435a Merge pull request 'fix-ci-db' (#437) from fix-ci-db into staging philipp 2024-04-24 15:58:18 +02:00
  • a42191715d fix ci philipp 2024-04-24 15:56:40 +02:00
  • 43e073c54e calc general boat cat (#436) philipp 2024-04-24 15:39:13 +02:00
  • 14e7616b88 calc-general-boatcat (#435) philipp 2024-04-24 15:39:07 +02:00
  • 8e03c935a5 fix ci philipp 2024-04-24 15:32:33 +02:00
  • 0560ed7a6a fix ci philipp 2024-04-24 15:29:52 +02:00
  • 07b197cc63 check changing of handoperated in backend philipp 2024-04-24 15:25:42 +02:00
  • a1ebd59f22 calc general boat cat philipp 2024-04-24 15:12:27 +02:00
  • aac7444896 Merge pull request 'handoperatable-feature' (#432) from handoperatable-feature into main philipp 2024-04-24 14:43:24 +02:00
  • d646996c80 Merge branch 'main' into handoperatable-feature philipp 2024-04-24 12:21:07 +02:00
  • 1412852087 Merge pull request 'handoperatable-feature' (#431) from handoperatable-feature into staging philipp 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 philipp 2024-04-24 12:04:26 +02:00
  • 7a59c67763 Merge pull request 'smarter-ci-cache' (#433) from smarter-ci-cache into staging philipp 2024-04-24 12:04:22 +02:00
  • a2b0146d6d fix ci philipp 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 philipp 2024-04-24 10:14:11 +02:00
  • d91baeb7bc Merge branch 'staging' into handoperatable-feature philipp 2024-04-24 09:56:47 +02:00
  • b5cdc8827a Merge pull request 'format-tera' (#429) from format-tera into staging philipp 2024-04-24 09:47:57 +02:00
  • b6b88ead37 Merge branch 'staging' into format-tera philipp 2024-04-24 09:46:54 +02:00
  • 6b3851bfe4 Merge pull request 'format tera w/ linter' (#430) from format-tera into main philipp 2024-04-24 09:46:19 +02:00
  • a0dbd0f490 implement first draft of switching handoperatable boats philipp 2024-04-24 09:37:45 +02:00
  • 3f80cb498c format tera w/ linter philipp 2024-04-24 08:57:41 +02:00
  • 7ba5070df3 Merge pull request 'group-reservations-in-log' (#426) from group-reservations-in-log into main philipp 2024-04-24 08:53:52 +02:00
  • cc1a7106cb Merge pull request 'group-reservations-in-log' (#425) from group-reservations-in-log into staging philipp 2024-04-24 08:51:38 +02:00
  • d4218289f0 fix ci philipp 2024-04-24 08:27:54 +02:00
  • 349a9f843c fix ci philipp 2024-04-24 07:39:44 +02:00
  • 982bb3b5c8 Merge pull request 'fix ci' (#428) from fix-ci into main philipp 2024-04-24 07:21:34 +02:00
  • b4f38089ee Merge pull request 'fix-ci' (#427) from fix-ci into staging philipp 2024-04-24 07:20:50 +02:00
  • e22dd8eb51 fix ci philipp 2024-04-24 07:20:16 +02:00
  • ac9c4b256e Merge pull request 'allow-reservation-edits' (#424) from allow-reservation-edits into main philipp 2024-04-23 23:23:10 +02:00
  • cfec4ef8b3 Merge branch 'main' into allow-reservation-edits philipp 2024-04-23 23:10:02 +02:00
  • a424e79cba Merge pull request 'allow-reservation-edits' (#423) from allow-reservation-edits into staging philipp 2024-04-23 23:05:47 +02:00
  • be24001b4b Merge branch 'allow-reservation-edits' into staging Marie Birner 2024-04-23 23:04:46 +02:00
  • d9885f9bba [TASK] change padding form Marie Birner 2024-04-23 22:58:48 +02:00
  • 6c2e0669d5 [TASK] improve sorting boats in schnellauswahl Marie Birner 2024-04-23 22:46:05 +02:00
  • e556b1375d [TASK] improve styling boat list Marie Birner 2024-04-23 22:39:59 +02:00
  • 23a623bdc9 [TASK] add etsch edge case js Marie Birner 2024-04-23 22:36:51 +02:00
  • b1d48a5154 [TASK] improve sidebar css Marie Birner 2024-04-23 22:35:52 +02:00
  • 61261c9816 allow edits of boatreservations, Fixes #417 philipp 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 philipp 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 philipp 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 philipp 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 philipp 2024-04-23 21:11:18 +02:00
  • 8f44fdadf2 add script to fetch current db philipp 2024-04-23 21:10:04 +02:00
  • 3abff08f61 [TASK] group reservations in log to avoid near-duplicates philipp 2024-04-23 20:40:06 +02:00
  • 32dee2c320 Merge pull request 'allow to upload membership pdf for users which don't have it' (#416) from allow-membership-uploads into main philipp 2024-04-22 10:37:49 +02:00
  • 3c67e0deeb Merge pull request 'allow to upload membership pdf for users which don't have it' (#415) from allow-membership-uploads into staging philipp 2024-04-22 10:37:09 +02:00
  • ef21e719c8 allow to upload membership pdf for users which don't have it philipp 2024-04-22 10:36:47 +02:00
  • 4a7cd2f085 Merge pull request 'update deps' (#414) from update-deps into main philipp 2024-04-19 16:38:31 +02:00