Commit Graph

1594 Commits

Author SHA1 Message Date
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
990a62fe16 Merge pull request 'fix seeds' (#98) from groups into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m5s
CI/CD Pipeline / deploy-staging (push) Successful in 14m48s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #98
2023-12-23 22:14:45 +01:00
411eea179c fix seeds
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m17s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-23 22:14:24 +01:00
108242139a Merge pull request 'in preparation to moving userdata into app, we switched to arbitrary groups' (#97) from groups into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m41s
CI/CD Pipeline / deploy-staging (push) Successful in 14m52s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #97
2023-12-23 21:30:02 +01:00
c7d7d0ca83 in preparation to moving userdata into app, we switched to arbitrary groups
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m4s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-23 21:27:52 +01:00
e4da952a62 Merge pull request 'show guest km, Fixes #41' (#95) from guest-km into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m54s
CI/CD Pipeline / deploy-staging (push) Successful in 14m34s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #95
2023-12-23 15:28:00 +01:00
aca5340370 show guest km, Fixes #41
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m56s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-23 15:26:49 +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
1c9da6815e Merge pull request 'update deps' (#93) from update-deps into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m0s
CI/CD Pipeline / deploy-staging (push) Successful in 14m36s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #93
2023-12-23 13:18:54 +01:00
1a24d1fad5 update deps
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m30s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-23 13:17:23 +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
70e209f1ce Merge pull request 'cleaner-code' (#91) from cleaner-code into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m54s
CI/CD Pipeline / deploy-staging (push) Successful in 14m35s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #91
2023-12-01 10:10:55 +01:00
e081c7a31f cleaner code
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m28s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-01 10:10:18 +01:00
7193760f05 Merge pull request 'cleaner code thanks to clippy' (#90) 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 14m16s
Reviewed-on: #90
2023-11-27 12:51:23 +01:00
9be23ff723 Merge pull request 'cleaner-code' (#89) from cleaner-code into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m55s
CI/CD Pipeline / deploy-staging (push) Successful in 14m24s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #89
2023-11-27 12:50:59 +01:00
861262b62b cleaner code thanks to clippy
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m54s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-27 12:49:36 +01:00
f408d4a181 Merge pull request 'update-deps' (#88) from update-deps into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m53s
CI/CD Pipeline / deploy-staging (push) Successful in 14m38s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #88
2023-11-27 11:59:02 +01:00
99fb9c624d Merge pull request 'fix ci' (#87) from update-deps into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m48s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 14m31s
Reviewed-on: #87
2023-11-27 11:58:49 +01:00
a2ca26fef3 fix ci
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m8s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-27 11:58:02 +01:00
e87ee53512 update deps
Some checks failed
CI/CD Pipeline / test (push) Failing after 7m18s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-27 09:33:10 +01:00
e714d18551 Merge pull request 'update deps' (#85) from update-deps into main
Some checks failed
CI/CD Pipeline / test (push) Failing after 7m10s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #85
2023-11-27 09:29:14 +01:00
b4d22cfdb1 update deps
Some checks failed
CI/CD Pipeline / test (push) Failing after 7m31s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-27 09:26:32 +01:00
d626486e55 Merge pull request 'push' (#83) from update-deps-rocket into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m15s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 14m13s
Reviewed-on: #83
2023-11-22 14:06:14 +01:00
d411127aa3 Merge pull request 'push' (#82) from update-deps-rocket into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m42s
CI/CD Pipeline / deploy-staging (push) Successful in 14m23s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #82
2023-11-22 14:05:41 +01:00
f5dc09adea push
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m38s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-22 14:05:05 +01:00
b840507051 Merge pull request 'update-sqlx' (#81) from update-sqlx into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m35s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 14m35s
Reviewed-on: #81
2023-11-22 14:03:57 +01:00
3cac53724a Merge branch 'main' into update-sqlx
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m49s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-22 14:03:29 +01:00
9a3f857936 Merge pull request 'upgrade sqlx to 0.7 Fixes #76 restructure registrations' (#80) from update-sqlx into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m51s
CI/CD Pipeline / deploy-staging (push) Successful in 14m46s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #80
2023-11-22 13:23:10 +01:00
7569798b00 upgrade sqlx to 0.7 Fixes #76 restructure registrations
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m57s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-22 13:19:31 +01:00
3bbc9e5614 Merge pull request 'update deps' (#78) from update-deps into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m36s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 14m12s
Reviewed-on: #78
2023-11-21 14:16:20 +01:00
ab6ab4af8d Merge pull request 'update-deps' (#77) from update-deps into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m46s
CI/CD Pipeline / deploy-staging (push) Successful in 14m18s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #77
2023-11-21 14:16:15 +01:00
51d0c5c260 update deps
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m58s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-21 11:41:35 +01:00
4ffe3deb54 Merge pull request 'fix query' (#75) from fix-query into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m51s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 14m35s
Reviewed-on: #75
2023-11-20 23:45:45 +01:00
8250881764 Merge pull request 'fix-query' (#74) from fix-query into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m57s
CI/CD Pipeline / deploy-staging (push) Successful in 14m35s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #74
2023-11-20 23:45:22 +01:00
2dd3885ba0 fix query
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m53s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-20 23:44:13 +01:00
4737663e8d Merge pull request 'years-changeable' (#72) from years-changeable into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m53s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 14m54s
Reviewed-on: #72
2023-11-20 19:46:14 +01:00
4297c8e971 Merge pull request 'add css magic from marie' (#73) from years-changeable into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m58s
CI/CD Pipeline / deploy-staging (push) Successful in 15m6s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #73
2023-11-20 18:43:04 +01:00
72aeeb5eab add css magic from marie
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) Has been skipped
2023-11-20 18:42:32 +01:00
f730dc74df Merge pull request 'fix typo' (#71) from fix-typo into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m56s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 14m34s
Reviewed-on: #71
2023-11-20 17:55:45 +01:00
2b427438b8 Merge pull request 'fix-typo' (#70) from fix-typo into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m50s
CI/CD Pipeline / deploy-staging (push) Successful in 14m46s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #70
2023-11-20 17:55:11 +01:00
c2f3c541fd fix typo
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m41s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-20 17:54:41 +01:00
08a48a64dc Merge pull request 'make years in stat changeable' (#69) from years-changeable into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m58s
CI/CD Pipeline / deploy-staging (push) Successful in 15m9s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #69
2023-11-20 17:53:26 +01:00
9ef1cd3459 make years in stat changeable
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m51s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-20 17:52:10 +01:00
e9472eff01 is in master :-)
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m44s
CI/CD Pipeline / deploy-staging (push) Successful in 14m16s
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-20 17:22:26 +01:00
77aae9eb89 Merge pull request 'efa-data' (#66) from efa-data into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m56s
CI/CD Pipeline / deploy-staging (push) Successful in 16m13s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #66
2023-11-20 16:02:40 +01:00
57bcad0b23 remove weird floats
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-11-20 15:50:07 +01:00
93852b4150 add efa data 2019-2021
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m54s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-20 15:47:53 +01:00
a17c120ebe Merge pull request 'log-2022' (#64) from log-2022 into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m42s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 14m13s
Reviewed-on: #64
2023-11-20 10:11:04 +01:00