Commit Graph

1321 Commits

Author SHA1 Message Date
bf24c8aa9c Merge branch 'ergo' into 'staging'
Ergo

See merge request PhilippHofer/rot!63
2023-11-02 13:04:12 +00:00
50de29284f disable reload on ergo page; allow camera capture 2023-11-02 13:50:34 +01:00
f7b24b4d50 Merge branch 'ergo' of gitlab.com:PhilippHofer/rot into ergo 2023-11-02 13:19:38 +01:00
2bff02f43a ergo: default own person 2023-11-02 13:19:21 +01:00
728d87ab05 show own data + add gitignore folder 2023-11-02 13:17:33 +01:00
41bdc73cfa fix deplox ci g 2023-11-02 13:02:44 +01:00
cf2d599e16 fix deploy 2023-11-02 13:01:19 +01:00
25eabefd43 show own data + add gitignore folder 2023-11-02 12:58:50 +01:00
07c9ac8a31 Merge branch 'ergo' into 'staging'
Ergo

See merge request PhilippHofer/rot!62
2023-11-02 11:45:07 +00:00
e1a7bdae65 fix ci 2023-11-02 12:25:13 +01:00
dc3e5555df push 2023-11-02 12:15:54 +01:00
1ff050a247 add ergo tool 2023-11-02 12:15:10 +01:00
2eba6a0f66 more rights to the kiosk! 2023-10-31 22:41:12 +01:00
7a622a5615 Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging 2023-10-31 22:16:51 +01:00
56ae0ae429 fix 1x no cox stuff 2023-10-31 22:16:14 +01:00
Marie Birner
d805f6c1cd [BUGFIX] stat wording and search string 2023-10-31 21:57:31 +01:00
Marie Birner
4179b7bd6b [TASK] declutter end trip view 2023-10-31 21:43:25 +01:00
Marie Birner
2bd5d76c2f Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging 2023-10-31 21:12:23 +01:00
ea1041aa73 fix node ci 2023-10-31 21:08:57 +01:00
Marie Birner
8a3cd8d688 [BUGFIX] relationship destination and distance 2023-10-31 21:04:38 +01:00
2d7c86f323 aaaaah 2023-10-31 21:02:56 +01:00
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