Commit Graph

1942 Commits

Author SHA1 Message Date
0aeec175ac show guests km
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m30s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-05 20:08:13 +01:00
2e91925b83 Merge pull request 'fix tests, as we now show all boats in kiosk mode' (#143) from fix-ci into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m9s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 17m37s
Reviewed-on: #143
2024-01-04 20:48:11 +01:00
248ab95ae9 Merge pull request 'fix tests, as we now show all boats in kiosk mode' (#142) from fix-ci into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m27s
CI/CD Pipeline / deploy-staging (push) Successful in 17m56s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #142
2024-01-04 20:47:47 +01:00
1cfbb97034 fix tests, as we now show all boats in kiosk mode
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-01-04 20:46:49 +01:00
2726db433e Merge pull request 'allow to add logbook entries up to a week late; show all boats in boatshouse; don't show guests for external boats' (#141) from fixes into main
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
Reviewed-on: #141
2024-01-04 20:44:26 +01:00
571e80085f Merge pull request 'allow to add logbook entries up to a week late; show all boats in boatshouse; don't show guests for external boats' (#140) from fixes into staging
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
Reviewed-on: #140
2024-01-04 20:44:06 +01:00
bada4deedd allow to add logbook entries up to a week late; show all boats in boatshouse; don't show guests for external boats
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
2024-01-04 20:43:38 +01:00
b73ae788e6 Merge pull request 'fix weird iphone issue' (#137) from fix-weird-iphone-issue into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m22s
CI/CD Pipeline / deploy-staging (push) Successful in 17m34s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #137
2024-01-03 10:00:10 +01:00
86075b72c6 Merge pull request 'fix weird iphone issue' (#136) from fix-weird-iphone-issue into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m40s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 18m4s
Reviewed-on: #136
2024-01-03 09:59:50 +01:00
f5bfb9fbdf fix weird iphone issue
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-01-03 09:59:09 +01:00
5b087baf02 Merge pull request 'staging' (#125) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m15s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 17m44s
Reviewed-on: #125
2024-01-01 21:05:58 +01:00
25d48241ee Merge pull request 'main' (#124) from main into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m18s
CI/CD Pipeline / deploy-staging (push) Successful in 17m40s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #124
2024-01-01 21:05:13 +01:00
cade5e1dfc Merge pull request 'fix-boatdamage' (#123) from fix-boatdamage into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m8s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 17m46s
Reviewed-on: #123
2024-01-01 18:55:37 +01:00
4430e7413f Merge pull request 'fix boat damage show' (#122) from fix-boatdamage into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m3s
CI/CD Pipeline / deploy-staging (push) Successful in 17m48s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #122
2024-01-01 18:55:13 +01:00
e925fadbb8 fix boat damage show
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m6s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-01 18:54:44 +01:00
ecb522bd98 Merge pull request 'fix' (#119) from fix into main
Some checks failed
CI/CD Pipeline / test (push) Successful in 15m50s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been cancelled
Reviewed-on: #119
2024-01-01 18:37:03 +01:00
9c9840ad5a Merge branch 'fix' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into fix
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
2024-01-01 18:36:34 +01:00
781fb8e952 push 2024-01-01 18:36:28 +01:00
54e02b7ea1 push 2024-01-01 18:36:28 +01:00
827613ca7c fix ci 2024-01-01 18:36:28 +01:00
945b96c55d Merge pull request 'push' (#121) from fix into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m51s
CI/CD Pipeline / deploy-staging (push) Successful in 18m21s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #121
2024-01-01 17:53:31 +01:00
4797d242a1 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
2024-01-01 17:53:00 +01:00
d1420961a0 Merge pull request 'push' (#120) from fix into staging
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #120
2024-01-01 17:51:45 +01:00
f4896f4d80 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
2024-01-01 17:51:23 +01:00
b916b9783b Merge pull request 'fix ci' (#118) from fix into staging
Some checks failed
CI/CD Pipeline / test (push) Successful in 11m45s
CI/CD Pipeline / deploy-staging (push) Failing after 5m45s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #118
2024-01-01 17:26:00 +01:00
71926ad4b9 fix ci
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-01-01 17:25:35 +01:00
78bd9a91f0 Merge pull request 'update' (#117) from update into main
Some checks failed
CI/CD Pipeline / deploy-staging (push) Waiting to run
CI/CD Pipeline / deploy-main (push) Waiting to run
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #117
2024-01-01 16:52:33 +01:00
a557b8cfbd Merge pull request 'update deps' (#116) from update-deps into main
Some checks are pending
CI/CD Pipeline / test (push) Waiting to run
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Reviewed-on: #116
2024-01-01 16:51:27 +01:00
aad947009f Merge pull request 'update deps' (#115) from update-deps into staging
Some checks failed
CI/CD Pipeline / test (push) Successful in 11m45s
CI/CD Pipeline / deploy-staging (push) Failing after 5m44s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #115
2024-01-01 16:50:58 +01:00
998054ab68 update deps
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m19s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-01 16:50:34 +01:00
29e7142883 Merge pull request 'main' (#111) from main into staging
Some checks failed
CI/CD Pipeline / deploy-staging (push) Waiting to run
CI/CD Pipeline / deploy-main (push) Waiting to run
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #111
2024-01-01 16:30:52 +01:00
1f44b73b3b Merge pull request 'push' (#110) from update into staging
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #110
2024-01-01 16:29:06 +01:00
24608c3da9 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
2024-01-01 16:28:31 +01:00
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
99d5328831 Merge pull request 'add mail' (#108) from mail into staging
Some checks failed
CI/CD Pipeline / deploy-staging (push) Waiting to run
CI/CD Pipeline / deploy-main (push) Waiting to run
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #108
2024-01-01 15:50:44 +01:00
0ad342b147 add mail
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
2024-01-01 15:50:06 +01:00
8b154b9675 Merge pull request 'better filter:' (#107) from nxdata into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m21s
CI/CD Pipeline / deploy-staging (push) Successful in 15m3s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #107
2023-12-30 21:30:48 +01:00
cf5b2751dd better filter:
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m49s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-30 21:30:27 +01:00
640f6bd0e7 Merge pull request 'add data from nx' (#106) from nxdata into staging
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
Reviewed-on: #106
2023-12-30 21:22:11 +01:00
5800f137f3 add data from nx
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2023-12-30 21:21:30 +01:00
415ac4f8d4 remove migration, as it is deployed on main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m4s
CI/CD Pipeline / deploy-staging (push) Successful in 14m34s
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-30 17:47:25 +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
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
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m53s
CI/CD Pipeline / deploy-staging (push) Successful in 14m57s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #103
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
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m1s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-28 18:19:43 +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