2370 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
philipp	cf56e8f6fe	Merge pull request 'allow deletion of boat' (#399) from allow-boat-deletion into main ... Reviewed-on: #399	2024-04-17 14:07:55 +02:00
philipp	4bec5443a2	Merge pull request 'dont-show-steer-btn-when-no-coxes' (#396) from dont-show-steer-btn-when-no-coxes into staging ... Reviewed-on: #396	2024-04-17 13:58:11 +02:00
philipp	ee7c62c3b7	Merge pull request 'don't show steer button when there are no coxes planned for this event; Fixes #357' (#397) from dont-show-steer-btn-when-no-coxes into main ... Reviewed-on: #397	2024-04-17 13:57:53 +02:00
philipp	42a3addd9a	make it more clear which action is required if notifications are present	2024-04-17 13:57:24 +02:00
philipp	7c71ce59bd	show notification badge in menu	2024-04-17 13:51:47 +02:00
philipp	858ae28eb3	allow deletion of boat	2024-04-17 13:18:35 +02:00
philipp	55b259061b	don't show steer button when there are no coxes planned for this event; Fixes #357	2024-04-17 13:04:03 +02:00
philipp	e2746d5105	Merge pull request 'send creator of boatdamage notification when it has been repaired' (#395) from boatdamage-notification-to-creator into main ... Reviewed-on: #395	2024-04-17 13:02:53 +02:00
philipp	1dd752f354	Merge pull request 'boatdamage-notification-to-creator' (#394) from boatdamage-notification-to-creator into staging ... Reviewed-on: #394	2024-04-17 13:02:49 +02:00
philipp	22d499d38b	send creator of boatdamage notification when it has been repaired	2024-04-17 12:44:31 +02:00
philipp	d0830e4631	Merge pull request 'don't clutter logs' (#393) from fix-logs into main ... Reviewed-on: #393	2024-04-17 12:22:59 +02:00
philipp	ef85d30846	Merge pull request 'fix-logs' (#392) from fix-logs into staging ... Reviewed-on: #392	2024-04-17 12:22:32 +02:00
philipp	36d7c43bbd	don't clutter logs	2024-04-17 12:21:57 +02:00
philipp	3ff8067c51	Merge pull request '[TASK] change favicon to make it sharper' (#391) from favicon into main ... Reviewed-on: #391	2024-04-17 11:41:59 +02:00
philipp	4d3af37d5f	Merge pull request 'favicon' (#390) from favicon into staging ... Reviewed-on: #390	2024-04-17 11:41:26 +02:00
Marie Birner	0f96f39f24	[TASK] change favicon to make it sharper	2024-04-17 11:35:12 +02:00
philipp	b32bdb5a70	Merge pull request 'styling-mail' (#389) from styling-mail into main ... Reviewed-on: #389	2024-04-17 11:34:07 +02:00
philipp	6956e4c487	Merge pull request 'styling-mail' (#388) from styling-mail into staging ... Reviewed-on: #388	2024-04-17 11:10:45 +02:00
Marie Birner	acb1c711e5	[TASK] style notification	2024-04-17 10:56:22 +02:00
Marie Birner	ec0bd91aa3	[TASK] styling mail	2024-04-17 10:54:07 +02:00
philipp	de786c2b51	Merge pull request 'fix-spacing' (#387) from fix-spacing into main ... Reviewed-on: #387	2024-04-16 20:07:11 +02:00
philipp	558f600271	Merge pull request 'no space before '/'' (#386) from fix-spacing into staging ... Reviewed-on: #386	2024-04-16 20:06:33 +02:00
philipp	5c680a8bea	no space before '/'	2024-04-16 20:05:55 +02:00
philipp	74f4d4854a	Merge pull request 'dont clutter logs' (#385) from usage-stats into main ... Reviewed-on: #385	2024-04-16 10:00:45 +02:00
philipp	4b49b5517d	Merge pull request 'dont clutter logs' (#384) from usage-stats into staging ... Reviewed-on: #384	2024-04-16 10:00:05 +02:00
philipp	0cd623482c	dont clutter logs	2024-04-16 09:59:39 +02:00
philipp	0a01b95c85	Merge pull request 'fix ci' (#383) from usage-stats into main ... Reviewed-on: #383	2024-04-16 09:08:26 +02:00
philipp	6daf2495a8	Merge pull request 'fix ci' (#381) from usage-stats into staging ... Reviewed-on: #381	2024-04-16 09:07:31 +02:00
philipp	8771a378da	fix ci	2024-04-16 09:06:24 +02:00
philipp	e84547c8ca	Merge pull request 'log usage' (#380) from usage-stats into main ... Reviewed-on: #380	2024-04-16 08:54:25 +02:00
philipp	872dcd0668	Merge pull request 'log usage' (#379) from usage-stats into staging ... Reviewed-on: #379	2024-04-16 08:53:46 +02:00
philipp	a9f74fcd3c	log usage	2024-04-16 08:52:37 +02:00
philipp	95752703ff	Merge pull request 'clean w/ clippy' (#378) from clippy into main ... Reviewed-on: #378	2024-04-15 23:37:27 +02:00
philipp	5e19a62c7e	Merge pull request 'clippy' (#377) from clippy into staging ... Reviewed-on: #377	2024-04-15 23:37:18 +02:00
philipp	2694829b6e	clean w/ clippy	2024-04-15 23:26:52 +02:00
philipp	151e1b7864	Merge pull request 'show steering person in logs if not cox' (#376) from show-steering-person-in-logs into main ... Reviewed-on: #376	2024-04-15 22:04:14 +02:00
philipp	5965b1d626	Merge pull request 'show steering person in logs if not cox' (#375) from show-steering-person-in-logs into staging ... Reviewed-on: #375	2024-04-15 22:03:39 +02:00
philipp	219b80377d	show notification to vorstand if boat entry with 'externes boot' or on multiple days is entered	2024-04-15 22:03:20 +02:00
philipp	8315a27ea8	fix tests (proper timezone), proper spacing	2024-04-15 21:32:16 +02:00
philipp	d070c7731a	show steering person in logs if not cox	2024-04-15 20:45:26 +02:00
philipp	c8f614e2d2	Merge pull request 'staging' (#374) from staging into main ... Reviewed-on: #374	2024-04-15 18:49:51 +02:00
philipp	4b07c11bc3	fix ci	2024-04-15 18:24:18 +02:00
philipp	0bc00472d7	don't create any notification if we are working with planned_event	2024-04-15 18:22:58 +02:00
philipp	37da4f2c3e	Merge branch 'main' into staging	2024-04-15 18:16:57 +02:00
philipp	74505c1554	add notification to all pot. coxes if trip is full	2024-04-15 18:16:43 +02:00
philipp	1869b36e09	add notification on canceled trips; add explicit 'cancel trip' button	2024-04-15 17:17:54 +02:00
philipp	13808d0103	Merge pull request 'staging' (#373) from staging into main ... Reviewed-on: #373	2024-04-15 11:26:20 +02:00
philipp	4a3803df51	Merge branch 'main' into staging	2024-04-15 11:25:49 +02:00
philipp	d58d4642af	1x boats: don't show 'Ruderer: ' in logbook; Fixes #362	2024-04-15 11:23:07 +02:00
philipp	c3fa5195d3	Merge pull request 'hide old verified boat damages' (#372) from hide-old-verified-boatdamages into main ... Reviewed-on: #372	2024-04-14 21:40:39 +02:00