2430 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	0c770f6ddc	Merge pull request 'update-fingerprint-responsible-people' (#663) from update-fingerprint-responsible-people into staging ... Reviewed-on: #663	2024-07-30 23:29:27 +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	7e41cd3f73	Merge pull request 'add-notification' (#661) from add-notification into staging ... Reviewed-on: #661	2024-07-30 23:27:11 +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	2d2e44126a	Merge pull request 'add-filter' (#659) from add-filter into staging ... Reviewed-on: #659	2024-07-29 14:27:01 +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	4555391dd3	Merge pull request 'push' (#657) from fix into staging ... Reviewed-on: #657	2024-07-28 07:44:37 +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	8aca437eb3	Merge pull request 'fix' (#655) from fix into staging ... Reviewed-on: #655	2024-07-28 07:37:57 +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	127d9784ad	Merge pull request 'external-cox' (#653) from external-cox into staging ... Reviewed-on: #653	2024-07-28 07:30:59 +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	26aa222bc6	Merge pull request 'fix-spacing' (#651) from fix-spacing into staging ... Reviewed-on: #651	2024-07-28 07:14:07 +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	7689a39ac5	Merge pull request 'allow instand logbook add' (#648) from fix-instand-add into staging ... Reviewed-on: #648	2024-07-27 20:49:22 +02:00
philipp	b43682ac39	allow instand logbook add	2024-07-27 20:48:32 +02:00
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