1242 Commits

Author SHA1 Message Date
415ac4f8d4 remove migration, as it is deployed on main 2023-12-30 17:47:25 +01:00
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)…' () from fix-cox-join-staging into staging
Reviewed-on: 
2023-12-28 18:20:19 +01:00
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
990a62fe16 Merge pull request 'fix seeds' () from groups into staging
Reviewed-on: 
2023-12-23 22:14:45 +01:00
411eea179c fix seeds 2023-12-23 22:14:24 +01:00
108242139a Merge pull request 'in preparation to moving userdata into app, we switched to arbitrary groups' () from groups into staging
Reviewed-on: 
2023-12-23 21:30:02 +01:00
c7d7d0ca83 in preparation to moving userdata into app, we switched to arbitrary groups 2023-12-23 21:27:52 +01:00
e4da952a62 Merge pull request 'show guest km, Fixes ' () from guest-km into staging
Reviewed-on: 
2023-12-23 15:28:00 +01:00
aca5340370 show guest km, Fixes 2023-12-23 15:26:49 +01:00
1c9da6815e Merge pull request 'update deps' () from update-deps into staging
Reviewed-on: 
2023-12-23 13:18:54 +01:00
1a24d1fad5 update deps 2023-12-23 13:17:23 +01:00
70e209f1ce Merge pull request 'cleaner-code' () from cleaner-code into staging
Reviewed-on: 
2023-12-01 10:10:55 +01:00
e081c7a31f cleaner code 2023-12-01 10:10:18 +01:00
7193760f05 Merge pull request 'cleaner code thanks to clippy' () from cleaner-code into main
Reviewed-on: 
2023-11-27 12:51:23 +01:00
9be23ff723 Merge pull request 'cleaner-code' () from cleaner-code into staging
Reviewed-on: 
2023-11-27 12:50:59 +01:00
861262b62b cleaner code thanks to clippy 2023-11-27 12:49:36 +01:00
f408d4a181 Merge pull request 'update-deps' () from update-deps into staging
Reviewed-on: 
2023-11-27 11:59:02 +01:00
99fb9c624d Merge pull request 'fix ci' () from update-deps into main
Reviewed-on: 
2023-11-27 11:58:49 +01:00
a2ca26fef3 fix ci 2023-11-27 11:58:02 +01:00
e87ee53512 update deps 2023-11-27 09:33:10 +01:00
e714d18551 Merge pull request 'update deps' () from update-deps into main
Reviewed-on: 
2023-11-27 09:29:14 +01:00
b4d22cfdb1 update deps 2023-11-27 09:26:32 +01:00
d626486e55 Merge pull request 'push' () from update-deps-rocket into main
Reviewed-on: 
2023-11-22 14:06:14 +01:00
d411127aa3 Merge pull request 'push' () from update-deps-rocket into staging
Reviewed-on: 
2023-11-22 14:05:41 +01:00
f5dc09adea push 2023-11-22 14:05:05 +01:00
b840507051 Merge pull request 'update-sqlx' () from update-sqlx into main
Reviewed-on: 
2023-11-22 14:03:57 +01:00
3cac53724a Merge branch 'main' into update-sqlx 2023-11-22 14:03:29 +01:00
9a3f857936 Merge pull request 'upgrade sqlx to 0.7 Fixes restructure registrations' () from update-sqlx into staging
Reviewed-on: 
2023-11-22 13:23:10 +01:00
7569798b00 upgrade sqlx to 0.7 Fixes restructure registrations 2023-11-22 13:19:31 +01:00
3bbc9e5614 Merge pull request 'update deps' () from update-deps into main
Reviewed-on: 
2023-11-21 14:16:20 +01:00
ab6ab4af8d Merge pull request 'update-deps' () from update-deps into staging
Reviewed-on: 
2023-11-21 14:16:15 +01:00
51d0c5c260 update deps 2023-11-21 11:41:35 +01:00
4ffe3deb54 Merge pull request 'fix query' () from fix-query into main
Reviewed-on: 
2023-11-20 23:45:45 +01:00
8250881764 Merge pull request 'fix-query' () from fix-query into staging
Reviewed-on: 
2023-11-20 23:45:22 +01:00
2dd3885ba0 fix query 2023-11-20 23:44:13 +01:00
4737663e8d Merge pull request 'years-changeable' () from years-changeable into main
Reviewed-on: 
2023-11-20 19:46:14 +01:00
4297c8e971 Merge pull request 'add css magic from marie' () from years-changeable into staging
Reviewed-on: 
2023-11-20 18:43:04 +01:00
72aeeb5eab add css magic from marie 2023-11-20 18:42:32 +01:00
f730dc74df Merge pull request 'fix typo' () from fix-typo into main
Reviewed-on: 
2023-11-20 17:55:45 +01:00
2b427438b8 Merge pull request 'fix-typo' () from fix-typo into staging
Reviewed-on: 
2023-11-20 17:55:11 +01:00
c2f3c541fd fix typo 2023-11-20 17:54:41 +01:00
08a48a64dc Merge pull request 'make years in stat changeable' () from years-changeable into staging
Reviewed-on: 
2023-11-20 17:53:26 +01:00
9ef1cd3459 make years in stat changeable 2023-11-20 17:52:10 +01:00
e9472eff01 is in master :-) 2023-11-20 17:22:26 +01:00
77aae9eb89 Merge pull request 'efa-data' () from efa-data into staging
Reviewed-on: 
2023-11-20 16:02:40 +01:00
57bcad0b23 remove weird floats 2023-11-20 15:50:07 +01:00
93852b4150 add efa data 2019-2021 2023-11-20 15:47:53 +01:00
a17c120ebe Merge pull request 'log-2022' () from log-2022 into main
Reviewed-on: 
2023-11-20 10:11:04 +01:00
42cffe117c added 2022 to main 2023-11-20 10:10:24 +01:00
0cbfadbe1c Merge pull request 'Update staging-diff.sql' () from log-2022 into staging
Reviewed-on: 
2023-11-20 08:23:25 +01:00