2404 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
philipp	df1a06531f	Merge pull request 'try new badge :-)' (#576) from add-badge into main ... Reviewed-on: #576	2024-06-06 10:48:51 +02:00
philipp	c6e3458588	Merge pull request 'add-badge' (#575) from add-badge into staging ... Reviewed-on: #575	2024-06-06 10:48:30 +02:00
philipp	7b499fb457	try new badge :-)	2024-06-06 10:38:18 +02:00
philipp	d00570ff2f	Merge pull request 'nicer-cal' (#574) from nicer-cal into main ... Reviewed-on: #574	2024-06-06 07:11:43 +02:00
philipp	a0528c1c65	Merge pull request 'nicer-cal' (#573) from nicer-cal into staging ... Reviewed-on: #573	2024-06-06 07:11:32 +02:00
philipp	bd63f2c386	use new additional information in test	2024-06-06 06:59:41 +02:00
philipp	e1b78b2725	don't lose trip_type on event cancellation; don't add empty notes in cal	2024-06-06 06:57:43 +02:00
philipp	fa14cfbf83	add cancellation, trip_type and notes to cal export	2024-06-06 06:47:41 +02:00
philipp	5f6cb9a12b	Merge pull request 'update deps' (#572) from update-deps into main ... Reviewed-on: #572	2024-06-05 15:07:08 +02:00
philipp	5e4d708884	Merge pull request 'update-deps' (#571) from update-deps into staging ... Reviewed-on: #571	2024-06-05 15:07:04 +02:00
philipp	1cac70cabb	update deps	2024-06-05 14:57:28 +02:00
philipp	09cb8ebfa9	Merge pull request 'allow-event-triptype-update' (#570) from allow-event-triptype-update into main ... Reviewed-on: #570	2024-06-04 08:32:57 +02:00
philipp	6e41758104	Merge pull request 'allow-event-triptype-update' (#569) from allow-event-triptype-update into staging ... Reviewed-on: #569	2024-06-04 08:32:54 +02:00
philipp	ab88ce3230	fix tests	2024-06-04 08:13:24 +02:00
philipp	30a6bc7109	allow event trip_type update	2024-06-04 08:12:20 +02:00
philipp	99409f9407	Merge pull request 'remove space' (#568) from fix-spaces into main ... Reviewed-on: #568	2024-06-02 14:53:14 +02:00
philipp	c916381fb0	Merge pull request 'fix-spaces' (#567) from fix-spaces into staging ... Reviewed-on: #567	2024-06-02 14:53:06 +02:00
philipp	7eff2a948a	remove space	2024-06-02 14:52:07 +02:00
philipp	243838fd44	Merge pull request 'remove debug println; better phrasing' (#566) from better-text into main ... Reviewed-on: #566	2024-05-30 18:53:42 +02:00
philipp	7d44204533	Merge pull request 'remove debug println; better phrasing' (#565) from better-text into staging ... Reviewed-on: #565	2024-05-30 18:53:35 +02:00
philipp	2de4c86c26	remove debug println; better phrasing	2024-05-30 11:57:03 +02:00
philipp	2889d40d55	Merge pull request 'better-text' (#564) from better-text into main ... Reviewed-on: #564	2024-05-30 11:52:17 +02:00
philipp	145892104b	Merge pull request 'try' (#563) from better-text into staging ... Reviewed-on: #563	2024-05-30 11:34:29 +02:00
philipp	e8d4672176	try	2024-05-30 11:34:01 +02:00
philipp	6c0f0e6b04	Merge pull request 'better-text' (#562) from better-text into staging ... Reviewed-on: #562	2024-05-30 11:12:03 +02:00
philipp	1bd643f6f4	try	2024-05-30 11:11:08 +02:00
philipp	562c32939d	better phrasing of text	2024-05-30 10:39:55 +02:00
philipp	3c0b8e5114	Merge pull request 'fix error' (#560) from fix-user-find-bug into main ... Reviewed-on: #560	2024-05-28 15:04:50 +02:00
philipp	e004d81ca1	Merge pull request 'fix error' (#559) from fix-user-find-bug into staging ... Reviewed-on: #559	2024-05-28 15:04:26 +02:00
philipp	6d5ff5404b	fix error	2024-05-28 15:04:06 +02:00
philipp	a8c0282918	Merge pull request 'migrated db' (#558) from migrated-db into main ... Reviewed-on: #558	2024-05-28 11:27:46 +02:00
philipp	41b5aff329	Merge pull request 'migrated-db' (#557) from migrated-db into staging ... Reviewed-on: #557	2024-05-28 11:27:41 +02:00
philipp	9973913af6	migrated db	2024-05-28 11:26:22 +02:00
philipp	7055c999e8	Merge pull request 'rename role to manage_events' (#556) from reanme-to-event into main ... Reviewed-on: #556	2024-05-28 11:18:50 +02:00
philipp	76c8456380	Merge pull request 'rename role to manage_events' (#555) from reanme-to-event into staging ... Reviewed-on: #555	2024-05-28 10:56:04 +02:00
philipp	c0d766832e	rename role to manage_events	2024-05-28 10:46:21 +02:00
philipp	f88c0be781	Merge pull request 'reanme-to-event' (#554) from reanme-to-event into main ... Reviewed-on: #554	2024-05-28 10:06:50 +02:00
philipp	95f43a73cf	Merge pull request 'reanme-to-event' (#553) from reanme-to-event into staging ... Reviewed-on: #553	2024-05-28 10:06:48 +02:00
philipp	91fa2a7762	add test for cancel-event-notification	2024-05-28 09:59:16 +02:00
philipp	82aa94c024	rename planned_event to event	2024-05-28 09:08:48 +02:00
philipp	aaf09208f3	Merge pull request 'don't care about cases for username' (#550) from case-insensitive-auth into main ... Reviewed-on: #550	2024-05-27 08:33:07 +02:00
philipp	3d340bf803	Merge pull request 'case-insensitive-auth' (#549) from case-insensitive-auth into staging ... Reviewed-on: #549	2024-05-27 08:33:03 +02:00
philipp	86f7ca7065	don't care about cases for username	2024-05-27 08:32:00 +02:00
philipp	e325e0478a	Merge pull request 'better spacing' (#548) from fix-spacing into main ... Reviewed-on: #548	2024-05-26 18:48:07 +02:00
philipp	ae096ad602	Merge pull request 'better spacing' (#547) from fix-spacing into staging ... Reviewed-on: #547	2024-05-26 18:47:51 +02:00
philipp	0298617fc9	better spacing	2024-05-26 18:47:09 +02:00
philipp	02ff89ba34	Merge pull request 'fix spacing' (#546) from fix-spacing into main ... Reviewed-on: #546	2024-05-26 14:18:13 +02:00
philipp	25d8b1ea7c	Merge pull request 'fix-spacing' (#545) from fix-spacing into staging ... Reviewed-on: #545	2024-05-26 14:18:07 +02:00
philipp	47a543fa64	fix spacing	2024-05-26 14:17:26 +02:00
philipp	4e8fd84134	Merge pull request 'fix typo' (#544) from type into main ... Reviewed-on: #544	2024-05-25 18:53:00 +02:00