|
|
251c83eb30
|
Merge pull request 'show guests km' (#147) from show-guests-km into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#147
|
2024-01-05 20:09:59 +01:00 |
|
|
|
0aeec175ac
|
show guests km
|
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
Reviewed-on: Ruderverein-Donau-Linz/rowt#143
|
2024-01-04 20:48:11 +01:00 |
|
|
|
1cfbb97034
|
fix tests, as we now show all boats in kiosk mode
|
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
Reviewed-on: Ruderverein-Donau-Linz/rowt#141
|
2024-01-04 20:44:26 +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
|
2024-01-04 20:43:38 +01:00 |
|
|
|
86075b72c6
|
Merge pull request 'fix weird iphone issue' (#136) from fix-weird-iphone-issue into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#136
|
2024-01-03 09:59:50 +01:00 |
|
|
|
f5bfb9fbdf
|
fix weird iphone issue
|
2024-01-03 09:59:09 +01:00 |
|
|
|
5b087baf02
|
Merge pull request 'staging' (#125) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#125
|
2024-01-01 21:05:58 +01:00 |
|
|
|
25d48241ee
|
Merge pull request 'main' (#124) from main into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#124
|
2024-01-01 21:05:13 +01:00 |
|
|
|
cade5e1dfc
|
Merge pull request 'fix-boatdamage' (#123) from fix-boatdamage into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#123
|
2024-01-01 18:55:37 +01:00 |
|
|
|
4430e7413f
|
Merge pull request 'fix boat damage show' (#122) from fix-boatdamage into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#122
|
2024-01-01 18:55:13 +01:00 |
|
|
|
e925fadbb8
|
fix boat damage show
|
2024-01-01 18:54:44 +01:00 |
|
|
|
ecb522bd98
|
Merge pull request 'fix' (#119) from fix into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#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
|
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
Reviewed-on: Ruderverein-Donau-Linz/rowt#121
|
2024-01-01 17:53:31 +01:00 |
|
|
|
4797d242a1
|
push
|
2024-01-01 17:53:00 +01:00 |
|
|
|
d1420961a0
|
Merge pull request 'push' (#120) from fix into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#120
|
2024-01-01 17:51:45 +01:00 |
|
|
|
f4896f4d80
|
push
|
2024-01-01 17:51:23 +01:00 |
|
|
|
b916b9783b
|
Merge pull request 'fix ci' (#118) from fix into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#118
|
2024-01-01 17:26:00 +01:00 |
|
|
|
71926ad4b9
|
fix ci
|
2024-01-01 17:25:35 +01:00 |
|
|
|
78bd9a91f0
|
Merge pull request 'update' (#117) from update into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#117
|
2024-01-01 16:52:33 +01:00 |
|
|
|
a557b8cfbd
|
Merge pull request 'update deps' (#116) from update-deps into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#116
|
2024-01-01 16:51:27 +01:00 |
|
|
|
aad947009f
|
Merge pull request 'update deps' (#115) from update-deps into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#115
|
2024-01-01 16:50:58 +01:00 |
|
|
|
998054ab68
|
update deps
|
2024-01-01 16:50:34 +01:00 |
|
|
|
29e7142883
|
Merge pull request 'main' (#111) from main into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#111
|
2024-01-01 16:30:52 +01:00 |
|
|
|
1f44b73b3b
|
Merge pull request 'push' (#110) from update into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#110
|
2024-01-01 16:29:06 +01:00 |
|
|
|
24608c3da9
|
push
|
2024-01-01 16:28:31 +01:00 |
|
|
|
6bbe1302d9
|
Merge pull request 'nxdata' (#109) from nxdata into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#109
|
2024-01-01 15:51:16 +01:00 |
|
|
|
99d5328831
|
Merge pull request 'add mail' (#108) from mail into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#108
|
2024-01-01 15:50:44 +01:00 |
|
|
|
0ad342b147
|
add mail
|
2024-01-01 15:50:06 +01:00 |
|
|
|
8b154b9675
|
Merge pull request 'better filter:' (#107) from nxdata into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#107
|
2023-12-30 21:30:48 +01:00 |
|
|
|
cf5b2751dd
|
better filter:
|
2023-12-30 21:30:27 +01:00 |
|
|
|
640f6bd0e7
|
Merge pull request 'add data from nx' (#106) from nxdata into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#106
|
2023-12-30 21:22:11 +01:00 |
|
|
|
5800f137f3
|
add data from nx
|
2023-12-30 21:21:30 +01:00 |
|
|
|
415ac4f8d4
|
remove migration, as it is deployed on main
|
2023-12-30 17:47:25 +01:00 |
|
|
|
f27e76f328
|
Merge pull request 'groups' (#104) from groups into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#104
|
2023-12-30 17:14:02 +01:00 |
|
|
|
c9c7ad967d
|
push
|
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
Reviewed-on: Ruderverein-Donau-Linz/rowt#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
|
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
Reviewed-on: Ruderverein-Donau-Linz/rowt#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
|
2023-12-28 18:14:11 +01:00 |
|
|
|
44bc217452
|
Merge pull request 'show guest km, Fixes #41' (#99) from guest-km into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#99
|
2023-12-23 22:30:27 +01:00 |
|
|
|
990a62fe16
|
Merge pull request 'fix seeds' (#98) from groups into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#98
|
2023-12-23 22:14:45 +01:00 |
|
|
|
411eea179c
|
fix seeds
|
2023-12-23 22:14:24 +01:00 |
|
