2171 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
philipp	f687e18195	Merge pull request 'be able to auto populate people from planned trip' (#671) from quick-add-people-from-planned-trip into main ... Reviewed-on: #671	2024-08-13 23:11:00 +02:00
philipp	e55f380c4f	be able to auto populate people from planned trip	2024-08-13 23:02:34 +02:00
philipp	bb502a4561	Merge pull request 'fix typo' (#669) from typo into main ... Reviewed-on: #669	2024-08-13 15:38:07 +02:00
philipp	ce28c95853	fix typo	2024-08-13 15:37:23 +02:00
philipp	2c3f69a562	Merge pull request 'allow admins to delete logbook entries' (#666) from allow-admin-to-delete-logbook-entries into main ... Reviewed-on: #666	2024-08-12 20:56:11 +02:00
philipp	a75c892cfb	allow admins to delete logbook entries	2024-08-12 20:55:31 +02:00
philipp	f71ab634d7	Merge pull request 'update people who are responsible for fingerprint access, reduce bus factor' (#664) from update-fingerprint-responsible-people into main ... Reviewed-on: #664	2024-07-30 23:29:32 +02:00
philipp	6b71449183	update people who are responsible for fingerprint access, reduce bus factor	2024-07-30 23:28:52 +02:00
philipp	d59b3f4345	Merge pull request 'push' (#662) from add-notification into main ... Reviewed-on: #662	2024-07-30 23:27:16 +02:00
philipp	2a8c339dcd	push	2024-07-30 23:24:46 +02:00
philipp	0dd10e1dd6	Merge pull request 'extend filter' (#660) from add-filter into main ... Reviewed-on: #660	2024-07-29 14:27:22 +02:00
philipp	def8028446	extend filter	2024-07-29 14:26:26 +02:00
philipp	db318c23cd	Merge pull request 'push' (#658) from fix into main ... Reviewed-on: #658	2024-07-28 07:44:42 +02:00
philipp	23aa6aa0f8	push	2024-07-28 07:43:56 +02:00
philipp	a682d1e6ce	Merge pull request 'ext person can also be shipmaster (and not cox)' (#656) from fix into main ... Reviewed-on: #656	2024-07-28 07:38:06 +02:00
philipp	cd1bf12e68	ext person can also be shipmaster (and not cox)	2024-07-28 07:36:57 +02:00
philipp	5f7591f52a	Merge pull request 'allow external cox; Fix #650' (#654) from external-cox into main ... Reviewed-on: #654	2024-07-28 07:31:02 +02:00
philipp	bf4ea502d3	allow external cox; Fix #650	2024-07-28 07:29:44 +02:00
philipp	c13dfdaa77	Merge pull request 'fix spacing in roles' (#652) from fix-spacing into main ... Reviewed-on: #652	2024-07-28 07:14:29 +02:00
philipp	0bc9e11b9a	fix spacing in roles	2024-07-28 07:13:21 +02:00
philipp	2fdcab9030	Merge pull request 'allow instand logbook add' (#649) from fix-instand-add into main ... Reviewed-on: #649	2024-07-27 20:49:30 +02:00
philipp	b43682ac39	allow instand logbook add	2024-07-27 20:48:32 +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	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	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	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	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	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	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	b1252e8d5c	fix empty but non-null date entries	2024-07-22 21:56:47 +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	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
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	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	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	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	bd7cd0020e	order logbook by arrival	2024-06-27 08:51:44 +02:00