Commit Graph

1756 Commits

Author SHA1 Message Date
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
2195c5464c Merge branch 'staging' into 'main'
fix

See merge request PhilippHofer/rot!49
2023-10-26 18:53:02 +00:00
3f5fc85a8b fix 2023-10-26 20:37:48 +02:00
e72679b812 Merge branch 'staging' into 'main'
deploy :O

See merge request PhilippHofer/rot!48
2023-10-26 17:06:02 +00:00
31b2ed3b37 deploy :O 2023-10-26 18:50:43 +02:00
0ad0461c6b Merge branch 'staging' into 'main'
[BUGFIX] truncate username

See merge request PhilippHofer/rot!47
2023-10-24 13:45:34 +00:00
Marie Birner
f7e499d135 [BUGFIX] truncate username 2023-10-24 15:28:06 +02:00
9c78f65cd3 Merge branch 'staging' into 'main'
move faq to wiki

See merge request PhilippHofer/rot!46
2023-10-24 13:14:04 +00:00
6d7ef2e836 fix ci.. 2023-10-24 14:58:32 +02:00
816425c158 fix ci 2023-10-24 14:56:59 +02:00
13f67cf24d update deps 2023-10-24 14:55:31 +02:00
ff6184e343 fix boat update error 2023-10-24 14:44:31 +02:00
cb109e7005 fix ci 2023-10-24 14:33:22 +02:00
e9641e6a33 move faq to wiki 2023-10-24 14:24:33 +02:00
415bc45f2e Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!45
2023-10-24 11:51:03 +00:00
afa5597f49 remove debug thingy 2023-10-24 13:36:14 +02:00
4321986204 debug 2023-10-24 13:14:26 +02:00
b1a66d71b9 test wiki auth 2023-10-24 12:36:14 +02:00
390ef6a965 Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!44
2023-10-24 09:16:09 +00:00
8f28553608 fix js errors 2023-10-24 11:01:35 +02:00
beb5f3a217 hide logbook for guests 2023-10-24 10:57:51 +02:00
83394a2284 Merge branch 'staging' into 'main'
scheckbuch can't see logbuch

See merge request PhilippHofer/rot!43
2023-10-24 08:30:58 +00:00
1f35be88ad scheckbuch can't see logbuch 2023-10-24 10:16:26 +02:00
44464424de Merge branch 'staging' into 'main'
allow adding boatdamage from everyone

See merge request PhilippHofer/rot!42
2023-10-24 07:55:29 +00:00
c27b83e9fd allow adding boatdamage from everyone 2023-10-24 09:40:48 +02:00
c0fd047cd4 Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!41
2023-10-24 07:38:32 +00:00
1c75b478e3 show logbuch to everyone 2023-10-24 09:22:07 +02:00
e4e6bf7f15 disable functionality until introduced 2023-10-24 09:14:11 +02:00
c015a672ea don't show scheckbuch-people in stat 2023-10-24 09:07:20 +02:00
9087fa9453 Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!40
2023-10-24 06:31:21 +00:00
6d4ebda4bc fix ci 2023-10-24 08:16:17 +02:00
Marie Birner
8ebc06e445 [TASK] translate alerts 2023-10-23 22:52:11 +02:00
Marie Birner
52b245b14e [TASK] correct sorting verified and style input / btn combi 2023-10-23 22:36:57 +02:00
76a05b6107 add verified for boats 2023-10-23 22:26:33 +02:00
f4d0a88575 merge 2023-10-23 22:00:04 +02:00
Marie Birner
da29d5dcdc [TASK] style delete button in logbook 2023-10-23 21:53:43 +02:00
fc42559f1b show amount of guests 2023-10-23 21:44:39 +02:00
Marie Birner
547cab368c [TASK] style header kiosk mode 2023-10-23 21:43:01 +02:00
88af24db7b allow all users to report boat damage 2023-10-23 21:38:08 +02:00
51860ded27 allow deletion of trip in kiosk mode 2023-10-23 21:32:44 +02:00
6f9edfa23f show header in kiosk mode 2023-10-23 21:05:59 +02:00
4cb374e246 remove debug statements 2023-10-23 09:36:38 +02:00
fadb65c631 Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!39
2023-10-23 06:49:07 +00:00
fa3ab3ec8a fix proper loggedin_user cookie after setting pw 2023-10-13 09:43:59 +02:00
3e327e98f1 allow editing of boat damages 2023-10-12 12:05:12 +02:00