Commit Graph

1755 Commits

Author SHA1 Message Date
8a40dfe017 allow filter for kiosk, to only show boats at specific location 2023-08-05 12:59:02 +02:00
d556e67cee Merge branch 'staging' into 'main'
create tests for model/logbook

See merge request PhilippHofer/rot!26
2023-08-05 10:51:56 +00:00
2192bb73ed Merge branch 'fix-order-trips' into 'staging'
fix order of displayed trips + events

See merge request PhilippHofer/rot!23
2023-08-05 10:38:58 +00:00
6809a85749 add option to lock boat on damage 2023-08-05 12:05:54 +02:00
f3c18c6949 update mail address 2023-08-02 18:36:38 +02:00
8eb8597293 allow optional different table in staging 2023-08-02 15:02:03 +02:00
ff31ad83fe add boatdamages functionality 2023-08-02 14:29:19 +02:00
f7e623b8c3 strip binary 2023-08-01 14:53:06 +02:00
f2baca668c add tests for tera/admin/planned_event
Closes #19
2023-07-31 21:33:49 +02:00
da6a16cd66 add tests for tera/admin/planned_event
Closes #20
2023-07-31 21:29:03 +02:00
8fa8e17c5a add tests for tera/admin/planned_event
Closes #24
2023-07-31 21:15:28 +02:00
96af3c3b17 create tests for /public
Closes #25
2023-07-31 21:07:01 +02:00
91ffcbb720 Merge branch 'fix-order-trips' of gitlab.com:PhilippHofer/rot into fix-order-trips 2023-07-31 20:12:56 +02:00
5b8dfb8284 fix order of displayed trips + events 2023-07-31 20:12:50 +02:00
3730940aed add tests for tera/log.rs
Closes #34
2023-07-31 20:09:03 +02:00
8b5be3fb41 add test for tera/admin/boat.rs
Fixes #33
2023-07-31 19:38:53 +02:00
47b534f8c3 create tests for model/logbook
Closes #31
2023-07-31 19:10:34 +02:00
adb26f6b91 create tests for model/rower.rs, Closes #32 2023-07-31 16:59:15 +02:00
32e6148844 use query_as instead of manual mapping 2023-07-31 16:33:44 +02:00
dc4b4b3499 add tests; Closes #30 2023-07-31 16:25:07 +02:00
bbb78cbc44 move todos to gitlab; write tests for /cox/remove/<id>; Closes #9 2023-07-31 13:34:02 +02:00
c4100e6c68 backup working systemd service files 2023-07-31 12:46:14 +02:00
a40001f0ad Merge branch 'update-deps' into 'staging'
update deps

See merge request PhilippHofer/rot!25
2023-07-31 07:33:27 +00:00
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