Commit Graph

Select branches

Hide Pull Requests

main

#6

#7

test

Mono Color

• 23aa6aa0f8 push philipp 2024-07-28 07:43:56 +02:00
• a682d1e6ce Merge pull request 'ext person can also be shipmaster (and not cox)' (#656) from fix into main philipp 2024-07-28 07:38:06 +02:00
• 8aca437eb3 Merge pull request 'fix' (#655) from fix into staging philipp 2024-07-28 07:37:57 +02:00
• cd1bf12e68 ext person can also be shipmaster (and not cox) philipp 2024-07-28 07:36:57 +02:00
• 5f7591f52a Merge pull request 'allow external cox; Fix #650' (#654) from external-cox into main philipp 2024-07-28 07:31:02 +02:00
• 127d9784ad Merge pull request 'external-cox' (#653) from external-cox into staging philipp 2024-07-28 07:30:59 +02:00
• bf4ea502d3 allow external cox; Fix #650 philipp 2024-07-28 07:29:44 +02:00
• c13dfdaa77 Merge pull request 'fix spacing in roles' (#652) from fix-spacing into main philipp 2024-07-28 07:14:29 +02:00
• 26aa222bc6 Merge pull request 'fix-spacing' (#651) from fix-spacing into staging philipp 2024-07-28 07:14:07 +02:00
• 0bc9e11b9a fix spacing in roles philipp 2024-07-28 07:13:21 +02:00
• 2fdcab9030 Merge pull request 'allow instand logbook add' (#649) from fix-instand-add into main philipp 2024-07-27 20:49:30 +02:00
• 7689a39ac5 Merge pull request 'allow instand logbook add' (#648) from fix-instand-add into staging philipp 2024-07-27 20:49:22 +02:00
• b43682ac39 allow instand logbook add philipp 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 philipp 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 philipp 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 philipp 2024-07-26 10:34:51 +02:00
• b4b922222c don't allow to finalize a logbook entry more than once philipp 2024-07-26 10:34:14 +02:00
• 84e76e8d65 Merge pull request 'one more error fix :-)' (#642) from fix into main philipp 2024-07-24 09:25:19 +02:00
• bdfcc6bc0a Merge pull request 'one more error fix :-)' (#641) from fix into staging philipp 2024-07-24 09:25:10 +02:00
• afa88b9529 one more error fix :-) philipp 2024-07-24 09:24:26 +02:00
• 4229a4e021 Merge pull request 'use proper role name' (#640) from fix into main philipp 2024-07-24 08:46:40 +02:00
• 6cd555298d Merge pull request 'fix' (#639) from fix into staging philipp 2024-07-24 08:46:34 +02:00
• f6207e2994 use proper role name philipp 2024-07-24 08:45:52 +02:00
• 4da996251a Merge pull request 'better logs' (#637) from update-logbook-entries into main philipp 2024-07-23 15:15:16 +02:00
• c44c0d8505 Merge pull request 'better logs' (#636) from update-logbook-entries into staging philipp 2024-07-23 15:14:50 +02:00
• aa9568f326 better logs philipp 2024-07-23 15:13:36 +02:00
• 1db09cd8ac Merge pull request 'update logbook entries' (#634) from update-logbook-entries into main philipp 2024-07-23 15:04:52 +02:00
• 59ef93d6fa Merge pull request 'update-logbook-entries' (#633) from update-logbook-entries into staging philipp 2024-07-23 15:04:47 +02:00
• 4a3ee5b551 update logbook entries philipp 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 philipp 2024-07-23 08:59:05 +02:00
• 4969a0d90a Merge pull request 'new-text' (#631) from new-text into staging philipp 2024-07-23 08:58:59 +02:00
• 3efcd99bbc new text to make clear who's responsible for fee payment philipp 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 philipp 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 philipp 2024-07-22 21:57:30 +02:00
• b1252e8d5c fix empty but non-null date entries philipp 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 philipp 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 philipp 2024-07-22 21:35:07 +02:00
• 622bc700f3 Merge pull request '[TASK] quick restructure of user screen' (#607) from restructure-user into main philipp 2024-07-16 17:39:05 +02:00
• 2540a3dc7c Merge pull request 'format tera files' (#627) from restructure-user into staging philipp 2024-07-16 17:38:48 +02:00
• 0e5fd25e61 format tera files philipp 2024-07-16 16:38:12 +01:00
• 72b86d4dad Merge pull request 'restructure-user' (#626) from restructure-user into staging philipp 2024-07-16 17:32:38 +02:00
• 16fbeea81b [BUGFIX] only-event.png Marie Birner 2024-07-16 14:38:27 +02:00
• bd6fbe772e [BUGFIX] vorstand-no-admin.png Marie Birner 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 philipp 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 philipp 2024-07-13 21:14:28 +02:00
• 088fe98995 fix test philipp 2024-07-13 20:03:10 +01:00
• 4237fafdff fix error, where log entries can't be added with boats with only steering philipp 2024-07-13 19:58:13 +01:00
• 6b24008c17 Merge pull request 'more robust data fetching' (#618) from more-robust-data-fetching into main philipp 2024-07-10 09:45:15 +02:00
• 4fbd3c7717 Merge pull request 'more robust data fetching' (#617) from more-robust-data-fetching into staging philipp 2024-07-10 09:45:01 +02:00
• ce8a095b31 more robust data fetching philipp 2024-07-10 09:44:38 +02:00
• 6c191cf59e Merge pull request 'fix term' (#615) from fix-term into main philipp 2024-06-27 17:11:15 +02:00
• b0698e70a4 Merge pull request 'fix term' (#614) from fix-term into staging philipp 2024-06-27 17:10:53 +02:00
• 6f7283f754 fix term philipp 2024-06-27 17:10:15 +02:00
• 323f721fc0 Merge pull request 'order logbook by arrival' (#612) from order-logbook-by-arrival into main philipp 2024-06-27 08:52:22 +02:00
• d0bcf1f384 Merge pull request 'order logbook by arrival' (#611) from order-logbook-by-arrival into staging philipp 2024-06-27 08:52:17 +02:00
• bd7cd0020e order logbook by arrival philipp 2024-06-27 08:51:44 +02:00
• 22bfe48d18 Merge pull request 'update deps' (#610) from update-deps into main philipp 2024-06-27 07:59:27 +02:00
• c379a6ca79 Merge pull request 'update deps' (#609) from update-deps into staging philipp 2024-06-27 07:59:15 +02:00
• 3543ffe9e1 update deps philipp 2024-06-27 07:58:30 +02:00
• 1d6770f11b Merge pull request 'minor visual improvements' (#608) from restructure-user into staging philipp 2024-06-24 19:57:08 +02:00
• 1ad6509568 minor visual improvements philipp 2024-06-24 19:56:35 +02:00
• 705f2ddc52 Merge pull request 'restructure-user' (#606) from restructure-user into staging philipp 2024-06-24 17:46:13 +02:00
• dba1e08c5d [TASK] quick restructure of user screen Marie Birner 2024-06-24 16:58:19 +02:00
• 1dc0c9c0e1 Merge pull request 'update iban' (#605) from update-iban into main philipp 2024-06-24 15:03:54 +02:00
• 45004567ed Merge pull request 'update-iban' (#604) from update-iban into staging philipp 2024-06-24 15:03:47 +02:00
• 3dff956544 update iban philipp 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 philipp 2024-06-21 11:25:27 +02:00
• 5c31fac230 Merge pull request 'allow vorstand to send mail + notifications' (#602) from allow-vorstand-to-send-things into staging philipp 2024-06-21 11:25:09 +02:00
• 3e983e05f9 allow vorstand to send mail + notifications philipp 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 philipp 2024-06-21 11:15:37 +02:00
• c55f9743aa Merge pull request 'allow-vorstand-to-send-things' (#600) from allow-vorstand-to-send-things into staging philipp 2024-06-21 11:15:30 +02:00
• 76290a64ae allow vorstand to send mail + notifications philipp 2024-06-21 11:14:48 +02:00
• 4b48fbaa82 Merge pull request 'update deps' (#599) from update-deps into main philipp 2024-06-19 13:44:08 +02:00
• d25cd491d0 Merge pull request 'update deps' (#598) from update-deps into staging philipp 2024-06-19 13:44:07 +02:00
• def8affb5f update deps philipp 2024-06-19 13:43:04 +02:00
• dfa7be9928 Merge pull request 'fix migration' (#597) from fix-migration into main philipp 2024-06-16 20:15:58 +02:00
• 03a467270d Merge pull request 'fix migration' (#596) from fix-migration into staging philipp 2024-06-16 20:15:54 +02:00
• 2159696112 fix migration test philipp 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 philipp 2024-06-15 18:28:24 +02:00
• 7af53203f8 Merge pull request 'more-sympatic-welcome-mail' (#594) from more-sympatic-welcome-mail into staging philipp 2024-06-15 18:28:09 +02:00
• b2393eb6ec mb is too serious philipp 2024-06-15 18:27:09 +02:00
• a5e82851ba fix missing word philipp 2024-06-10 22:23:26 +02:00
• 80725e223b add more life to the mails :-) philipp 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 philipp 2024-06-10 22:08:18 +02:00
• 70be6726db Merge pull request 'add-wifi-pw-new-members' (#592) from add-wifi-pw-new-members into staging philipp 2024-06-10 22:08:10 +02:00
• 5f301324ee add wifi pw in welcome mail philipp 2024-06-10 22:07:14 +02:00
• 9558965e8f Merge pull request 'require necessary fields' (#591) from require-necessary-fields into main philipp 2024-06-10 20:59:43 +02:00
• 08fc324cc6 Merge pull request 'require-necessary-fields' (#590) from require-necessary-fields into staging philipp 2024-06-10 20:59:38 +02:00
• 5f4d8982a8 require necessary fields philipp 2024-06-10 20:58:42 +02:00
• 0e2ef9e256 Merge pull request 'add trailer reservation funcitonality; Fixes #443' (#588) from trailer-reservation into main philipp 2024-06-10 20:00:25 +02:00
• df007524ed Merge pull request 'merged :-)' (#589) from trailer-reservation into staging philipp 2024-06-10 20:00:07 +02:00
• 1dc91f4f28 merged :-) philipp 2024-06-10 19:59:39 +02:00
• 5720767af3 Merge pull request 'add trailer reservation funcitonality; Fixes #443' (#587) from trailer-reservation into staging philipp 2024-06-10 19:58:13 +02:00
• f56da43723 fix copied stuff philipp 2024-06-10 19:48:16 +02:00
• 9dc1ec6fa0 add trailer reservation funcitonality; Fixes #443 philipp 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 philipp 2024-06-10 19:08:22 +02:00
• 1215bdbd84 Merge pull request 'delte-trip-btn' (#585) from delte-trip-btn into staging philipp 2024-06-10 19:08:17 +02:00
• 16687e39ab remove unused attribute philipp 2024-06-10 19:07:55 +02:00
• 957c474389 add delete trip button in edit window; Fixes #449 philipp 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 philipp 2024-06-10 15:50:31 +02:00