main #111

Merged
philipp merged 10 commits from main into staging 2024-01-01 16:30:54 +01:00

10 Commits

Author SHA1 Message Date
6bbe1302d9 Merge pull request 'nxdata' (#109) from nxdata into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m22s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 15m1s
Reviewed-on: #109
2024-01-01 15:51:16 +01:00
f27e76f328 Merge pull request 'groups' (#104) from groups into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m9s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 14m50s
Reviewed-on: #104
2023-12-30 17:14:02 +01:00
c9c7ad967d push
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2023-12-30 17:13:21 +01:00
a17ac5f1b5 fix seeds 2023-12-30 17:11:48 +01:00
9fb4167b50 in preparation to moving userdata into app, we switched to arbitrary groups 2023-12-30 17:11:46 +01:00
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
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m50s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 14m19s
Reviewed-on: #101
2023-12-28 18:15:09 +01:00
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
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m45s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-28 18:14:11 +01:00
44bc217452 Merge pull request 'show guest km, Fixes #41' (#99) from guest-km into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m14s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 14m24s
Reviewed-on: #99
2023-12-23 22:30:27 +01:00
d586f37cbe Merge pull request 'update-deps' (#94) from update-deps into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m7s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 14m16s
Reviewed-on: #94
2023-12-23 13:19:35 +01:00
58943bd4e2 Merge pull request 'cleaner code' (#92) from cleaner-code into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m52s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 14m33s
Reviewed-on: #92
2023-12-01 10:11:17 +01:00