2453 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
philipp	afc23ae519	Merge pull request 'fix-permission' (#708) from fix-permission into staging ... Reviewed-on: #708	2024-08-22 20:55:32 +02:00
philipp	fdd9c3bdff	Merge pull request 'allow vorstand to see fees' (#709) from fix-permission into main ... Reviewed-on: #709	2024-08-22 20:55:22 +02:00
philipp	ae6c129fd3	allow vorstand to see fees	2024-08-22 20:54:27 +02:00
philipp	396aa204a4	Merge pull request 'rsync was a bad idea' (#707) from reduce-deployment-time into main ... Reviewed-on: #707	2024-08-21 17:40:35 +02:00
philipp	4290010cc6	Merge pull request 'rsync was a bad idea' (#706) from reduce-deployment-time into staging ... Reviewed-on: #706	2024-08-21 17:40:29 +02:00
philipp	bbe4949203	rsync was a bad idea	2024-08-21 17:39:43 +02:00
philipp	94130f9230	Merge pull request 'use rsync instead of scp' (#705) from reduce-deployment-time into main ... Reviewed-on: #705	2024-08-21 17:09:04 +02:00
philipp	14dbe748a3	Merge pull request 'reduce-deployment-time' (#704) from reduce-deployment-time into staging ... Reviewed-on: #704	2024-08-21 17:09:02 +02:00
philipp	010627c91d	use rsync instead of scp	2024-08-21 17:07:44 +02:00
philipp	36276e5415	verify, that boat is not on water on adding log entry; Fixes #625 (#697) ... Reviewed-on: #697	2024-08-21 17:05:41 +02:00
philipp	b827bd6996	verify, that boat is not on water on adding log entry; Fixes #625 (#696) ... Reviewed-on: #696	2024-08-21 17:05:36 +02:00
philipp	4bb0e54635	Merge pull request 'update' (#703) from update into main ... Reviewed-on: #703	2024-08-21 16:35:46 +02:00
philipp	83a2c7ab92	Merge pull request 'update' (#702) from update into staging ... Reviewed-on: #702	2024-08-21 16:35:41 +02:00
philipp	a518023892	Merge branch 'main' into staging	2024-08-21 16:34:13 +02:00
philipp	3f06e91e24	Merge pull request 'fix price' (#701) from fix-price into main ... Reviewed-on: #701	2024-08-21 16:29:00 +02:00
philipp	2b4345ba77	fix price	2024-08-21 16:28:13 +02:00
philipp	412c45a9df	Merge pull request 'care-about-einschreibgebuehr' (#699) from care-about-einschreibgebuehr into main ... Reviewed-on: #699	2024-08-21 16:17:52 +02:00
philipp	d971c1504c	clippy	2024-08-21 16:16:07 +02:00
philipp	cf9b79e56e	care about einschreibgebuehr	2024-08-21 16:14:54 +02:00
philipp	5d01d18e70	Merge pull request 'nag, if a long logentry is entered w/o trip_type; Fixes #448' (#695) from trip-type-nag into main ... Reviewed-on: #695	2024-08-19 14:36:59 +02:00
philipp	1e96a2d6e1	Merge pull request 'trip-type-nag' (#694) from trip-type-nag into staging ... Reviewed-on: #694	2024-08-19 14:36:53 +02:00
philipp	ff81ab0246	Merge pull request 'notify-on-always-show-events' (#693) from notify-on-always-show-events into main ... Reviewed-on: #693	2024-08-19 14:14:21 +02:00
philipp	202e128c98	Merge pull request 'notify-on-always-show-events' (#692) from notify-on-always-show-events into staging ... Reviewed-on: #692	2024-08-19 14:14:14 +02:00
philipp	ecb347c204	nag, if a long logentry is entered w/o trip_type; Fixes #448	2024-08-19 14:06:00 +02:00
philipp	2bc426be52	Merge pull request 'allow to edit users; Fixes #688' (#689) from allow-user-edit-role into main ... Reviewed-on: #689	2024-08-19 14:04:39 +02:00
philipp	0a130709c7	Merge pull request 'allow-user-edit-role' (#690) from allow-user-edit-role into staging ... Reviewed-on: #690	2024-08-19 14:04:35 +02:00
philipp	6e8a5927a6	create notification if a new event with 'always_show' is updated	2024-08-19 13:50:08 +02:00
philipp	a31bacb3e1	create notification if a new event with 'always_show' is entered	2024-08-19 13:39:22 +02:00
philipp	93c8316543	allow to edit users; Fixes #688	2024-08-19 13:23:08 +02:00
philipp	6e72e2a753	Merge pull request 'board-scheckbook' (#687) from board-scheckbook into main ... Reviewed-on: #687	2024-08-19 12:13:05 +02:00
philipp	c847c3300f	Merge pull request 'board-scheckbook' (#686) from board-scheckbook into staging ... Reviewed-on: #686	2024-08-19 12:12:59 +02:00
philipp	116c7523d2	styling	2024-08-19 11:57:51 +02:00
philipp	eb15421d08	allow move from schnuppern to scheckbuch	2024-08-19 11:53:28 +02:00
philipp	818cf0d40b	Merge branch 'main' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt	2024-08-19 11:27:39 +02:00
philipp	ed9d93410e	allow vorstand to add scheckbücher	2024-08-19 11:27:10 +02:00
philipp	c162e0a66f	Merge pull request 'kassier-role' (#685) from kassier-role into main ... Reviewed-on: #685	2024-08-19 11:24:10 +02:00
philipp	e965d33a7b	Merge pull request 'kassier-role' (#684) from kassier-role into staging ... Reviewed-on: #684	2024-08-19 11:24:07 +02:00
philipp	3d77a2325c	allow kassier to change payment stuff	2024-08-19 10:57:02 +02:00
philipp	afb6af8ece	only one '+' role necessary + introduction of 'kassier' role	2024-08-19 10:51:50 +02:00
philipp	799e94a50f	switch to macro for special user	2024-08-19 10:34:37 +02:00
philipp	c41dc0853a	Merge pull request 'maybe unpublishing a post works now?' (#683) from fix into main ... Reviewed-on: #683	2024-08-19 09:55:46 +02:00
philipp	74edcfa119	Merge pull request 'fix' (#682) from fix into staging ... Reviewed-on: #682	2024-08-19 09:55:45 +02:00
philipp	cc7bd3a416	maybe unpublishing a post works now?	2024-08-19 09:55:01 +02:00
philipp	bfee85a963	Merge pull request 'send-blogpost-notification' (#680) from send-blogpost-notification into main ... Reviewed-on: #680	2024-08-18 22:24:14 +02:00
philipp	f55f45d960	Merge pull request 'send-blogpost-notification' (#681) from send-blogpost-notification into staging ... Reviewed-on: #681	2024-08-18 22:24:06 +02:00
philipp	c68593a67d	proper docs; Fixes #645	2024-08-18 22:23:08 +02:00
philipp	20da86f69e	delete notification again, if article is unpublished	2024-08-18 22:21:36 +02:00
philipp	8588e1f71b	Merge pull request 'send-blogpost-notification' (#679) from send-blogpost-notification into staging ... Reviewed-on: #679	2024-08-18 21:58:31 +02:00
philipp	8efb3aea2c	push	2024-08-18 21:57:20 +02:00
philipp	83aa9bc84c	allow for article_titles	2024-08-18 21:46:11 +02:00