2455 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
philipp	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 ... Reviewed-on: #647	2024-07-27 20:47:00 +02:00
philipp	958dda9f52	Merge pull request 'don't allow to finalize a logbook entry more than once' (#644) from only-allow-finalizing-logbook-once into main ... Reviewed-on: #644	2024-07-26 10:34:57 +02:00
philipp	1eea8c9662	Merge pull request 'only-allow-finalizing-logbook-once' (#643) from only-allow-finalizing-logbook-once into staging ... Reviewed-on: #643	2024-07-26 10:34:51 +02:00
philipp	b4b922222c	don't allow to finalize a logbook entry more than once	2024-07-26 10:34:14 +02:00
philipp	84e76e8d65	Merge pull request 'one more error fix :-)' (#642) from fix into main ... Reviewed-on: #642	2024-07-24 09:25:19 +02:00
philipp	bdfcc6bc0a	Merge pull request 'one more error fix :-)' (#641) from fix into staging ... Reviewed-on: #641	2024-07-24 09:25:10 +02:00
philipp	afa88b9529	one more error fix :-)	2024-07-24 09:24:26 +02:00
philipp	4229a4e021	Merge pull request 'use proper role name' (#640) from fix into main ... Reviewed-on: #640	2024-07-24 08:46:40 +02:00
philipp	6cd555298d	Merge pull request 'fix' (#639) from fix into staging ... Reviewed-on: #639	2024-07-24 08:46:34 +02:00
philipp	f6207e2994	use proper role name	2024-07-24 08:45:52 +02:00
philipp	4da996251a	Merge pull request 'better logs' (#637) from update-logbook-entries into main ... Reviewed-on: #637	2024-07-23 15:15:16 +02:00
philipp	c44c0d8505	Merge pull request 'better logs' (#636) from update-logbook-entries into staging ... Reviewed-on: #636	2024-07-23 15:14:50 +02:00
philipp	aa9568f326	better logs	2024-07-23 15:13:36 +02:00
philipp	1db09cd8ac	Merge pull request 'update logbook entries' (#634) from update-logbook-entries into main ... Reviewed-on: #634	2024-07-23 15:04:52 +02:00
philipp	59ef93d6fa	Merge pull request 'update-logbook-entries' (#633) from update-logbook-entries into staging ... Reviewed-on: #633	2024-07-23 15:04:47 +02:00
philipp	4a3ee5b551	update logbook entries	2024-07-23 14:57:09 +02:00
philipp	c73b3e94c3	Merge pull request 'new text to make clear who's responsible for fee payment' (#632) from new-text into main ... Reviewed-on: #632	2024-07-23 08:59:05 +02:00
philipp	4969a0d90a	Merge pull request 'new-text' (#631) from new-text into staging ... Reviewed-on: #631	2024-07-23 08:58:59 +02:00
philipp	3efcd99bbc	new text to make clear who's responsible for fee payment	2024-07-23 08:57:43 +02:00
philipp	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 ... Reviewed-on: #629	2024-07-22 21:59:36 +02:00
philipp	8112f1ed2a	Merge pull request 'fix empty but non-null date entries' (#630) from halfprice-fee into staging ... Reviewed-on: #630	2024-07-22 21:57:30 +02:00
philipp	b1252e8d5c	fix empty but non-null date entries	2024-07-22 21:56:47 +02:00
philipp	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 ... Reviewed-on: #628	2024-07-22 21:36:05 +02:00
philipp	a62fd116ea	show halfprice for member fees if entry_year == current_year && start_date >= 1.7. Fixes #616	2024-07-22 21:35:07 +02:00
philipp	622bc700f3	Merge pull request '[TASK] quick restructure of user screen' (#607) from restructure-user into main ... Reviewed-on: #607	2024-07-16 17:39:05 +02:00
philipp	2540a3dc7c	Merge pull request 'format tera files' (#627) from restructure-user into staging ... Reviewed-on: #627	2024-07-16 17:38:48 +02:00
philipp	0e5fd25e61	format tera files	2024-07-16 16:38:12 +01:00
philipp	72b86d4dad	Merge pull request 'restructure-user' (#626) from restructure-user into staging ... Reviewed-on: #626	2024-07-16 17:32:38 +02: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
philipp	647970e1fc	Merge pull request 'fix-steering-only-boat-logentry' (#624) from fix-steering-only-boat-logentry into main ... Reviewed-on: #624	2024-07-13 21:16:05 +02:00
philipp	1e1c1bb6d9	Merge pull request 'fix-steering-only-boat-logentry' (#623) from fix-steering-only-boat-logentry into staging ... Reviewed-on: #623	2024-07-13 21:14:28 +02:00
philipp	088fe98995	fix test	2024-07-13 20:03:10 +01:00
philipp	4237fafdff	fix error, where log entries can't be added with boats with only steering	2024-07-13 19:58:13 +01:00
philipp	6b24008c17	Merge pull request 'more robust data fetching' (#618) from more-robust-data-fetching into main ... Reviewed-on: #618	2024-07-10 09:45:15 +02:00
philipp	4fbd3c7717	Merge pull request 'more robust data fetching' (#617) from more-robust-data-fetching into staging ... Reviewed-on: #617	2024-07-10 09:45:01 +02:00
philipp	ce8a095b31	more robust data fetching	2024-07-10 09:44:38 +02:00
philipp	6c191cf59e	Merge pull request 'fix term' (#615) from fix-term into main ... Reviewed-on: #615	2024-06-27 17:11:15 +02:00
philipp	b0698e70a4	Merge pull request 'fix term' (#614) from fix-term into staging ... Reviewed-on: #614	2024-06-27 17:10:53 +02:00
philipp	6f7283f754	fix term	2024-06-27 17:10:15 +02:00
philipp	323f721fc0	Merge pull request 'order logbook by arrival' (#612) from order-logbook-by-arrival into main ... Reviewed-on: #612	2024-06-27 08:52:22 +02:00
philipp	d0bcf1f384	Merge pull request 'order logbook by arrival' (#611) from order-logbook-by-arrival into staging ... Reviewed-on: #611	2024-06-27 08:52:17 +02:00
philipp	bd7cd0020e	order logbook by arrival	2024-06-27 08:51:44 +02:00
philipp	22bfe48d18	Merge pull request 'update deps' (#610) from update-deps into main ... Reviewed-on: #610	2024-06-27 07:59:27 +02:00
philipp	c379a6ca79	Merge pull request 'update deps' (#609) from update-deps into staging ... Reviewed-on: #609	2024-06-27 07:59:15 +02:00
philipp	3543ffe9e1	update deps	2024-06-27 07:58:30 +02:00
philipp	1d6770f11b	Merge pull request 'minor visual improvements' (#608) from restructure-user into staging ... Reviewed-on: #608	2024-06-24 19:57:08 +02:00
philipp	1ad6509568	minor visual improvements	2024-06-24 19:56:35 +02:00
philipp	705f2ddc52	Merge pull request 'restructure-user' (#606) from restructure-user into staging ... Reviewed-on: #606	2024-06-24 17:46:13 +02:00
Marie Birner	dba1e08c5d	[TASK] quick restructure of user screen	2024-06-24 16:58:19 +02:00