1317 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
philipp	b916b9783b	Merge pull request 'fix ci' (#118) from fix into staging ... Reviewed-on: #118	2024-01-01 17:26:00 +01:00
philipp	71926ad4b9	fix ci	2024-01-01 17:25:35 +01:00
philipp	78bd9a91f0	Merge pull request 'update' (#117) from update into main ... Reviewed-on: #117	2024-01-01 16:52:33 +01:00
philipp	a557b8cfbd	Merge pull request 'update deps' (#116) from update-deps into main ... Reviewed-on: #116	2024-01-01 16:51:27 +01:00
philipp	aad947009f	Merge pull request 'update deps' (#115) from update-deps into staging ... Reviewed-on: #115	2024-01-01 16:50:58 +01:00
philipp	998054ab68	update deps	2024-01-01 16:50:34 +01:00
philipp	29e7142883	Merge pull request 'main' (#111) from main into staging ... Reviewed-on: #111	2024-01-01 16:30:52 +01:00
philipp	1f44b73b3b	Merge pull request 'push' (#110) from update into staging ... Reviewed-on: #110	2024-01-01 16:29:06 +01:00
philipp	24608c3da9	push	2024-01-01 16:28:31 +01:00
philipp	6bbe1302d9	Merge pull request 'nxdata' (#109) from nxdata into main ... Reviewed-on: #109	2024-01-01 15:51:16 +01:00
philipp	99d5328831	Merge pull request 'add mail' (#108) from mail into staging ... Reviewed-on: #108	2024-01-01 15:50:44 +01:00
philipp	0ad342b147	add mail	2024-01-01 15:50:06 +01:00
philipp	8b154b9675	Merge pull request 'better filter:' (#107) from nxdata into staging ... Reviewed-on: #107	2023-12-30 21:30:48 +01:00
philipp	cf5b2751dd	better filter:	2023-12-30 21:30:27 +01:00
philipp	640f6bd0e7	Merge pull request 'add data from nx' (#106) from nxdata into staging ... Reviewed-on: #106	2023-12-30 21:22:11 +01:00
philipp	5800f137f3	add data from nx	2023-12-30 21:21:30 +01:00
philipp	415ac4f8d4	remove migration, as it is deployed on main	2023-12-30 17:47:25 +01:00
philipp	f27e76f328	Merge pull request 'groups' (#104) from groups into main ... Reviewed-on: #104	2023-12-30 17:14:02 +01:00
philipp	c9c7ad967d	push	2023-12-30 17:13:21 +01:00
philipp	a17ac5f1b5	fix seeds	2023-12-30 17:11:48 +01:00
philipp	9fb4167b50	in preparation to moving userdata into app, we switched to arbitrary groups	2023-12-30 17:11:46 +01:00
philipp	7e625cd5a5	Merge pull request 'fix error where joining cox to planned_event is not dispaying properly. The problem was the restructuring commit 7569798b00 (diff-0496fd5ec13efcfc97602dc5784170a0dd1)…' (#103) from fix-cox-join-staging into staging ... Reviewed-on: #103	2023-12-28 18:20:19 +01:00
philipp	34280dbbea	fix error where joining cox to planned_event is not dispaying properly. The problem was the restructuring commit 7569798b00 (diff-0496fd5ec13efcfc97602dc5784170a0dd124e6e) where I compared different ids	2023-12-28 18:19:43 +01:00
philipp	54c013ec10	Merge pull request 'fix error where joining cox to planned_event is not dispaying properly. The problem was the restructuring commit 7569798b00 (diff-0496fd5ec13efcfc97602dc5784170a0dd1)…' (#101) from fix-cox-join into main ... Reviewed-on: #101	2023-12-28 18:15:09 +01:00
philipp	a9fbb05944	fix error where joining cox to planned_event is not dispaying properly. The problem was the restructuring commit 7569798b00 (diff-0496fd5ec13efcfc97602dc5784170a0dd124e6e) where I compared different ids	2023-12-28 18:14:11 +01:00
philipp	44bc217452	Merge pull request 'show guest km, Fixes #41' (#99) from guest-km into main ... Reviewed-on: #99	2023-12-23 22:30:27 +01:00
philipp	990a62fe16	Merge pull request 'fix seeds' (#98) from groups into staging ... Reviewed-on: #98	2023-12-23 22:14:45 +01:00
philipp	411eea179c	fix seeds	2023-12-23 22:14:24 +01:00
philipp	108242139a	Merge pull request 'in preparation to moving userdata into app, we switched to arbitrary groups' (#97) from groups into staging ... Reviewed-on: #97	2023-12-23 21:30:02 +01:00
philipp	c7d7d0ca83	in preparation to moving userdata into app, we switched to arbitrary groups	2023-12-23 21:27:52 +01:00
philipp	e4da952a62	Merge pull request 'show guest km, Fixes #41' (#95) from guest-km into staging ... Reviewed-on: #95	2023-12-23 15:28:00 +01:00
philipp	aca5340370	show guest km, Fixes #41	2023-12-23 15:26:49 +01:00
philipp	d586f37cbe	Merge pull request 'update-deps' (#94) from update-deps into main ... Reviewed-on: #94	2023-12-23 13:19:35 +01:00
philipp	1c9da6815e	Merge pull request 'update deps' (#93) from update-deps into staging ... Reviewed-on: #93	2023-12-23 13:18:54 +01:00
philipp	1a24d1fad5	update deps	2023-12-23 13:17:23 +01:00
philipp	58943bd4e2	Merge pull request 'cleaner code' (#92) from cleaner-code into main ... Reviewed-on: #92	2023-12-01 10:11:17 +01:00
philipp	70e209f1ce	Merge pull request 'cleaner-code' (#91) from cleaner-code into staging ... Reviewed-on: #91	2023-12-01 10:10:55 +01:00
philipp	e081c7a31f	cleaner code	2023-12-01 10:10:18 +01:00
philipp	7193760f05	Merge pull request 'cleaner code thanks to clippy' (#90) from cleaner-code into main ... Reviewed-on: #90	2023-11-27 12:51:23 +01:00
philipp	9be23ff723	Merge pull request 'cleaner-code' (#89) from cleaner-code into staging ... Reviewed-on: #89	2023-11-27 12:50:59 +01:00
philipp	861262b62b	cleaner code thanks to clippy	2023-11-27 12:49:36 +01:00
philipp	f408d4a181	Merge pull request 'update-deps' (#88) from update-deps into staging ... Reviewed-on: #88	2023-11-27 11:59:02 +01:00
philipp	99fb9c624d	Merge pull request 'fix ci' (#87) from update-deps into main ... Reviewed-on: #87	2023-11-27 11:58:49 +01:00
philipp	a2ca26fef3	fix ci	2023-11-27 11:58:02 +01:00
philipp	e87ee53512	update deps	2023-11-27 09:33:10 +01:00
philipp	e714d18551	Merge pull request 'update deps' (#85) from update-deps into main ... Reviewed-on: #85	2023-11-27 09:29:14 +01:00
philipp	b4d22cfdb1	update deps	2023-11-27 09:26:32 +01:00
philipp	d626486e55	Merge pull request 'push' (#83) from update-deps-rocket into main ... Reviewed-on: #83	2023-11-22 14:06:14 +01:00
philipp	d411127aa3	Merge pull request 'push' (#82) from update-deps-rocket into staging ... Reviewed-on: #82	2023-11-22 14:05:41 +01:00
philipp	f5dc09adea	push	2023-11-22 14:05:05 +01:00