1351 Commits

Author SHA1 Message Date
4d79d232cf Merge pull request 'remove external cox from stat' () from remove-external-cox into staging
Reviewed-on: 
2024-01-05 22:24:06 +01:00
9cbbdb38c2 remove external cox from stat 2024-01-05 22:23:36 +01:00
17119999c9 Merge pull request 'hide external boat in stats' () from hide-external-boat-in-stats into main
Reviewed-on: 
2024-01-05 20:43:11 +01:00
c199c3241e Merge pull request 'hide external boat in stats' () from hide-external-boat-in-stats into staging
Reviewed-on: 
2024-01-05 20:42:48 +01:00
b50471d339 hide external boat in stats 2024-01-05 20:42:20 +01:00
5cfaf44a79 Merge pull request 'fix-stat' () from fix-stat into main
Reviewed-on: 
2024-01-05 20:39:02 +01:00
f0755a44e3 Merge pull request 'fix stat' () from fix-stat into staging
Reviewed-on: 
2024-01-05 20:38:24 +01:00
1c020da84f fix stat 2024-01-05 20:37:40 +01:00
251c83eb30 Merge pull request 'show guests km' () from show-guests-km into main
Reviewed-on: 
2024-01-05 20:09:59 +01:00
323f6da201 Merge pull request 'show guests km' () from show-guests-km into staging
Reviewed-on: 
2024-01-05 20:08:47 +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' () from fix-ci into main
Reviewed-on: 
2024-01-04 20:48:11 +01:00
248ab95ae9 Merge pull request 'fix tests, as we now show all boats in kiosk mode' () from fix-ci into staging
Reviewed-on: 
2024-01-04 20:47:47 +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' () from fixes into main
Reviewed-on: 
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' () from fixes into staging
Reviewed-on: 
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 2024-01-04 20:43:38 +01:00
b73ae788e6 Merge pull request 'fix weird iphone issue' () from fix-weird-iphone-issue into staging
Reviewed-on: 
2024-01-03 10:00:10 +01:00
86075b72c6 Merge pull request 'fix weird iphone issue' () from fix-weird-iphone-issue into main
Reviewed-on: 
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' () from staging into main
Reviewed-on: 
2024-01-01 21:05:58 +01:00
25d48241ee Merge pull request 'main' () from main into staging
Reviewed-on: 
2024-01-01 21:05:13 +01:00
cade5e1dfc Merge pull request 'fix-boatdamage' () from fix-boatdamage into main
Reviewed-on: 
2024-01-01 18:55:37 +01:00
4430e7413f Merge pull request 'fix boat damage show' () from fix-boatdamage into staging
Reviewed-on: 
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' () from fix into main
Reviewed-on: 
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' () from fix into staging
Reviewed-on: 
2024-01-01 17:53:31 +01:00
4797d242a1 push 2024-01-01 17:53:00 +01:00
d1420961a0 Merge pull request 'push' () from fix into staging
Reviewed-on: 
2024-01-01 17:51:45 +01:00
f4896f4d80 push 2024-01-01 17:51:23 +01:00
b916b9783b Merge pull request 'fix ci' () from fix into staging
Reviewed-on: 
2024-01-01 17:26:00 +01:00
71926ad4b9 fix ci 2024-01-01 17:25:35 +01:00
78bd9a91f0 Merge pull request 'update' () from update into main
Reviewed-on: 
2024-01-01 16:52:33 +01:00
a557b8cfbd Merge pull request 'update deps' () from update-deps into main
Reviewed-on: 
2024-01-01 16:51:27 +01:00
aad947009f Merge pull request 'update deps' () from update-deps into staging
Reviewed-on: 
2024-01-01 16:50:58 +01:00
998054ab68 update deps 2024-01-01 16:50:34 +01:00
29e7142883 Merge pull request 'main' () from main into staging
Reviewed-on: 
2024-01-01 16:30:52 +01:00
1f44b73b3b Merge pull request 'push' () from update into staging
Reviewed-on: 
2024-01-01 16:29:06 +01:00
24608c3da9 push 2024-01-01 16:28:31 +01:00
6bbe1302d9 Merge pull request 'nxdata' () from nxdata into main
Reviewed-on: 
2024-01-01 15:51:16 +01:00
99d5328831 Merge pull request 'add mail' () from mail into staging
Reviewed-on: 
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:' () from nxdata into staging
Reviewed-on: 
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' () from nxdata into staging
Reviewed-on: 
2023-12-30 21:22:11 +01:00
5800f137f3 add data from nx 2023-12-30 21:21:30 +01:00