Commit Graph

1150 Commits

Author SHA1 Message Date
Marie Birner
dc4eddc044 Merge commit 'ef0965fad12c402e14fad64f3ece50fca3cb9638' into staging 2023-10-31 20:58:38 +01:00
Marie Birner
3c7f56e94f [TASK] beautify Steuerperson/Schiffsführer tag in list view 2023-10-31 20:57:28 +01:00
d9c7c218bc allow no cox in 1x; require them in >2x 2023-10-31 20:57:05 +01:00
Marie Birner
e428d01ea8 Merge branch 'boat-stats' into 'main'
Boat stats

See merge request PhilippHofer/rot!59
2023-10-31 19:42:42 +00:00
ef0965fad1 Merge branch 'boat-stats' into 'staging'
Boat stats

See merge request PhilippHofer/rot!61
2023-10-31 19:42:42 +00:00
aed8e7d5c3 use names that also m enjoys seeing 2023-10-31 20:29:33 +01:00
8479d0c70b fix link 2023-10-31 20:25:12 +01:00
abe4a68c23 Merge branch 'boat-stats' into 'staging'
also show in kiosk mode

See merge request PhilippHofer/rot!60
2023-10-31 17:35:54 +00:00
fe5ba9020d also show in kiosk mode 2023-10-31 18:22:34 +01:00
a6519d7b7b Merge branch 'boat-stats' into 'staging'
add boat stats Fixes #50

Closes #50

See merge request PhilippHofer/rot!58
2023-10-31 15:20:36 +00:00
730f9e5dff add boat stats Fixes #50 2023-10-31 16:07:15 +01:00
10529234da Merge branch 'new-db' into 'staging'
New db

See merge request PhilippHofer/rot!57
2023-10-30 18:27:06 +00:00
07baf55612 fix npm build error 2023-10-30 19:13:34 +01:00
74dabae390 clean up + make maxitemcount in sidebar work 2023-10-30 19:08:19 +01:00
107f84734a Merge branch 'new-db' into 'staging'
New db

See merge request PhilippHofer/rot!56
2023-10-30 16:34:52 +00:00
40f1d436fc migrate to new schema 2023-10-30 16:26:36 +01:00
143da65609 Merge branch 'new-db' into 'staging'
New db

See merge request PhilippHofer/rot!55
2023-10-30 14:50:23 +00:00
376204b927 Merge branch 'quickfixes' into 'main'
[BUGFIX] add cursor-pointer boats

See merge request PhilippHofer/rot!54
2023-10-30 14:39:05 +00:00
d297893086 fix ci 2023-10-30 15:37:01 +01:00
d6043384a5 Merge branch 'new-db' of gitlab.com:PhilippHofer/rot into new-db 2023-10-30 15:32:30 +01:00
6e6b6eafa3 fix stat query 2023-10-30 15:32:17 +01:00
388ed175bd finish frontend(?) 2023-10-30 15:32:17 +01:00
7788be5a17 use proper names for new form fields 2023-10-30 15:32:17 +01:00
2d520298e7 frontend for new db 2023-10-30 15:32:17 +01:00
e256d7274d use proper names for new form fields 2023-10-30 15:32:17 +01:00
010a8a870b allow proper amount of rowers 2023-10-30 15:32:17 +01:00
ccc9f76691 do proper things in ui @ new log 2023-10-30 15:32:17 +01:00
1d7f95e522 finish backend tests of new db layout 2023-10-30 15:32:17 +01:00
09075989e3 first draft 2023-10-30 15:32:17 +01:00
98578abbe6 fix stat query 2023-10-30 15:31:12 +01:00
93c6fd2ce7 finish frontend(?) 2023-10-30 15:19:43 +01:00
855962369a use proper names for new form fields 2023-10-30 13:49:49 +01:00
be5a235418 frontend for new db 2023-10-30 13:39:58 +01:00
Marie Birner
5a596132ab Merge branch 'quickfixes' into staging 2023-10-30 09:43:44 +01:00
Marie Birner
a8c43cbf40 [BUGFIX] add cursor-pointer boats 2023-10-30 09:43:20 +01:00
4e607e135a use proper names for new form fields 2023-10-30 09:31:22 +01:00
b348a3248a allow proper amount of rowers 2023-10-30 09:23:50 +01:00
67d86bb908 do proper things in ui @ new log 2023-10-30 09:21:35 +01:00
1689f4a1ee finish backend tests of new db layout 2023-10-29 20:41:30 +01:00
aa23f15682 first draft 2023-10-29 18:42:12 +01:00
9497116265 add first draft of notifications 2023-10-29 17:31:07 +01:00
dee66525b4 Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!53
2023-10-28 13:23:48 +00:00
dcb7bc4c24 clean 2023-10-28 14:48:51 +02:00
08a1d16f88 add functionality to show log 2023-10-28 14:48:08 +02:00
f12b573132 Merge branch 'staging' into 'main'
add logs

See merge request PhilippHofer/rot!52
2023-10-28 12:48:04 +00:00
cfd0ccc8c2 add logs 2023-10-28 14:33:22 +02:00
c64c93692e Merge branch 'staging' into 'main'
fix time in logbook

See merge request PhilippHofer/rot!51
2023-10-28 08:45:30 +00:00
ec046f4cf5 fix time in logbook 2023-10-28 10:30:16 +02:00
860c8e9715 Merge branch 'staging' into 'main'
fix invalid link in kiosk mode

See merge request PhilippHofer/rot!50
2023-10-26 20:26:38 +00:00
bc4512acc1 fix invalid link in kiosk mode 2023-10-26 22:11:17 +02:00