Commit Graph

1632 Commits

Author SHA1 Message Date
e6800edf68 Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!24
2023-07-31 07:25:34 +00:00
8fa81a6f8e update deps 2023-07-31 09:22:41 +02:00
a79e22e19f add ideas 2023-07-31 09:19:28 +02:00
b2e84d727c use local timestamp for log 2023-07-31 09:10:26 +02:00
fa75cf3169 add ideas 2023-07-31 08:24:28 +02:00
103e770fa6 fix order of displayed trips + events 2023-07-31 08:18:37 +02:00
700ab8110b Merge branch 'remove-static-folder' into 'staging'
remove static folder

See merge request PhilippHofer/rot!22
2023-07-31 05:53:25 +00:00
727d8d52dd remove static folder 2023-07-31 07:52:57 +02:00
b5962dcb84 Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!17
2023-07-31 05:51:51 +00:00
332b505955 Merge branch 'verify-rower-on-water' into 'staging'
push

See merge request PhilippHofer/rot!21
2023-07-30 21:11:51 +00:00
1bff814811 push 2023-07-30 22:59:47 +02:00
Marie Birner
b1a42b2683 Merge branch 'js' into 'staging'
[TASK] show pretty timestamp

See merge request PhilippHofer/rot!20
2023-07-30 20:35:58 +00:00
5e571b935e Merge branch 'fix-ci' into 'staging'
fix ci

See merge request PhilippHofer/rot!19
2023-07-30 20:35:56 +00:00
57d7b35912 fix ci 2023-07-30 22:35:17 +02:00
Marie Birner
0c0d1ffb00 [TASK] show pretty timestamp 2023-07-30 22:35:16 +02:00
4fe17284bb Merge branch 'fix-error-diff-sqlite-version' into 'staging'
fix error on diff sqlite version

See merge request PhilippHofer/rot!18
2023-07-30 20:18:11 +00:00
7e09c81d5e fix error on diff sqlite version 2023-07-30 22:17:47 +02:00
9e413978eb Merge branch 'fix-error-diff-sqlite-version' into 'staging'
Fix error diff sqlite version

See merge request PhilippHofer/rot!16
2023-07-30 19:54:54 +00:00
e3105ca8d7 Merge branch 'styling' into 'staging'
Styling

See merge request PhilippHofer/rot!15
2023-07-30 19:18:11 +00:00
38c53a26f9 Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging 2023-07-30 21:17:12 +02:00
a3ca996f78 push 2023-07-30 21:17:02 +02:00
cf897df36f push 2023-07-30 21:17:02 +02:00
6029d7b9b6 use new nodejs 2023-07-30 21:17:02 +02:00
d1dd5372bd push 2023-07-30 21:17:02 +02:00
2beff31a71 push 2023-07-30 21:17:02 +02:00
e701042891 build js 2023-07-30 21:17:02 +02:00
838352fcfc strip binary 2023-07-30 21:17:02 +02:00
c63a2b2032 push 2023-07-30 21:17:02 +02:00
88dd0470a2 push 2023-07-30 21:17:02 +02:00
ee2ae2e35d push 2023-07-30 21:17:02 +02:00
f40d409c3d push 2023-07-30 21:17:02 +02:00
f2026d8d84 push 2023-07-30 21:17:02 +02:00
d334e575b4 push 2023-07-30 21:17:02 +02:00
6bc94c1482 push 2023-07-30 21:17:02 +02:00
002cd3e6eb push 2023-07-30 21:17:02 +02:00
cfba5bc856 push 2023-07-30 21:17:02 +02:00
36f800d65c push 2023-07-30 21:17:02 +02:00
ae0ef8e18f push 2023-07-30 21:17:02 +02:00
4d53bdb724 push 2023-07-30 21:17:02 +02:00
6831ac00b7 push 2023-07-30 21:17:02 +02:00
b27953dc41 fix 2023-07-30 21:17:02 +02:00
dc0bd01661 first draft of ci deploy 2023-07-30 21:17:02 +02:00
Marie Birner
9b270fbbf9 [TASK] show pretty timestamp 2023-07-30 20:53:27 +02:00
aab8b04811 Merge branch 'styling' of gitlab.com:PhilippHofer/rot into styling 2023-07-30 20:50:37 +02:00
f3590c1437 fix parsing of sqlite timestamp (arrival) 2023-07-30 20:50:28 +02:00
Marie Birner
041733a3ba [TASK] set boat status 2023-07-30 20:45:16 +02:00
dee228dce8 send departure as timestamp 2023-07-30 20:40:15 +02:00
09672c2a6e add dead boat :-( 2023-07-30 20:29:48 +02:00
e2b5495da6 lowercase baotdamage 2023-07-30 20:25:59 +02:00
aba8bc7749 add light damage 2023-07-30 20:21:59 +02:00