Marie Birner
|
ed67c46d4a
|
Merge branch 'styling' into 'staging'
[TASK] add multiselct js
See merge request PhilippHofer/rot!11
|
2023-07-30 16:11:44 +00:00 |
|
Marie Birner
|
80e57dfe12
|
[TASK] add multiselct js
|
2023-07-30 18:07:44 +02:00 |
|
|
|
db5be57ba3
|
Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging
|
2023-07-30 17:56:53 +02:00 |
|
|
|
d2f6e37725
|
push
|
2023-07-30 17:56:32 +02:00 |
|
|
|
3b29f8caab
|
Merge branch 'styling' into 'staging'
Styling
See merge request PhilippHofer/rot!10
|
2023-07-30 15:48:24 +00:00 |
|
|
|
82a55c48b5
|
Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging
|
2023-07-30 17:42:08 +02:00 |
|
|
|
ba48c08e4b
|
push
|
2023-07-30 17:42:01 +02:00 |
|
|
|
bcf6c9d06d
|
push
|
2023-07-30 17:41:41 +02:00 |
|
|
|
57edcb497c
|
push
|
2023-07-30 17:41:34 +02:00 |
|
|
|
9538dac8ed
|
push
|
2023-07-30 17:30:40 +02:00 |
|
|
|
63f2e805ca
|
push
|
2023-07-30 17:30:11 +02:00 |
|
|
|
c4f070fa05
|
push
|
2023-07-30 17:28:50 +02:00 |
|
|
|
2f954ea02e
|
push
|
2023-07-30 17:27:32 +02:00 |
|
Marie Birner
|
354e267a3a
|
[WIP] styling logbook page
|
2023-07-30 17:20:03 +02:00 |
|
|
|
fb78b3b071
|
push
|
2023-07-30 17:14:56 +02:00 |
|
Marie Birner
|
8de9568684
|
[WIP] styling logbook page
|
2023-07-30 16:59:20 +02:00 |
|
|
|
7a9e30cdae
|
push
|
2023-07-30 16:46:57 +02:00 |
|
|
|
cd959dd9ab
|
push
|
2023-07-30 16:31:38 +02:00 |
|
|
|
fa48bf2984
|
push
|
2023-07-30 16:27:54 +02:00 |
|
|
|
eca9884b40
|
push
|
2023-07-30 16:10:56 +02:00 |
|
|
|
a901d237aa
|
push
|
2023-07-30 16:02:02 +02:00 |
|
|
|
3561940a0e
|
fix
|
2023-07-30 15:59:51 +02:00 |
|
|
|
91d15f162f
|
first draft of ci deploy
|
2023-07-30 15:57:37 +02:00 |
|
Marie Birner
|
e4376c29b4
|
Merge commit 'db3cf59d21a14ed87b6226484a1d7adb19322f64'
# Conflicts:
# templates/includes/forms/log.html.tera
# templates/kiosk.html.tera
|
2023-07-30 15:10:48 +02:00 |
|
Marie Birner
|
4d80421b9b
|
[WIP] styling kiosk page
|
2023-07-30 15:10:09 +02:00 |
|
|
|
db3cf59d21
|
format tera files
|
2023-07-30 14:33:50 +02:00 |
|
Marie Birner
|
2ff7e24cbd
|
[WIP] styling kiosk page
|
2023-07-30 14:31:15 +02:00 |
|
|
|
bf2135b1b3
|
fix typo
|
2023-07-30 14:16:58 +02:00 |
|
|
|
2e80f7bc38
|
add logbook history
|
2023-07-30 14:13:49 +02:00 |
|
|
|
c6d19d276c
|
show boats on water
|
2023-07-30 14:02:53 +02:00 |
|
|
|
c414164b82
|
push
|
2023-07-30 14:00:15 +02:00 |
|
|
|
039df224a6
|
first draft layout logbook
|
2023-07-30 13:42:33 +02:00 |
|
|
|
e49279afef
|
remove log from page
|
2023-07-30 13:02:29 +02:00 |
|
|
|
e30dae68ad
|
remove not unseful logging
|
2023-07-28 11:50:11 +02:00 |
|
|
|
861df59ebc
|
set some fields to required
|
2023-07-28 10:25:57 +02:00 |
|
|
|
267672b96b
|
update deps
|
2023-07-27 23:54:37 +02:00 |
|
|
|
efbe589c83
|
remove unnecessary autotrait
|
2023-07-27 22:42:00 +02:00 |
|
|
|
301d3527c1
|
fix planned_event creation
|
2023-07-27 22:41:01 +02:00 |
|
|
|
56e1deccc0
|
fix error w/ clippy
|
2023-07-27 22:20:40 +02:00 |
|
|
|
2e9ad2215f
|
remove unused import
|
2023-07-27 22:18:00 +02:00 |
|
|
|
16a0654e1f
|
only save (encrypted) user_id in cookie
|
2023-07-27 22:16:12 +02:00 |
|
|
|
b5fd4018ff
|
extract common functionality to functoin
|
2023-07-27 15:24:29 +02:00 |
|
|
|
0c906f2bda
|
check if shipmaster is already on the water
|
2023-07-27 15:00:52 +02:00 |
|
|
|
621058356d
|
proper redirects
|
2023-07-27 14:50:44 +02:00 |
|
|
|
7093e29c9b
|
fix
|
2023-07-27 14:44:47 +02:00 |
|
|
|
1733fc7fe7
|
clippy clean
|
2023-07-27 14:40:05 +02:00 |
|
|
|
38300d826a
|
add kiosk mode
|
2023-07-27 14:38:46 +02:00 |
|
|
|
b3349c87ff
|
don't show cox twice
|
2023-07-27 13:15:40 +02:00 |
|
|
|
d5c16ad7a0
|
allow non-cox to (only) use 1x
|
2023-07-27 13:07:00 +02:00 |
|
|
|
fad7d747d7
|
fixes
|
2023-07-27 12:31:53 +02:00 |
|
