Commit Graph

Select branches

Hide Pull Requests

main

#6

#7

#8

#9

test

Mono Color

• 4ef88ba6c5 don't be too funny philipp 2023-09-05 13:21:18 +02:00
• c06173d04b [TASK] replace Freitag with Markttag for phipsi Marie Birner 2023-04-10 22:56:47 +02:00
• e6daa99974 fix order ci philipp 2023-09-05 13:54:03 +02:00
• 22fbc715ec Merge branch 'funny-replace' of gitlab.com:PhilippHofer/rot into funny-replace philipp 2023-09-05 13:44:37 +02:00
• ac728dc203 don't be too funny philipp 2023-09-05 13:21:18 +02:00
• df26112820 [TASK] replace Freitag with Markttag for phipsi Marie Birner 2023-04-10 22:56:47 +02:00
• 21eef385d8 Merge branch 'upgrade-deps' of gitlab.com:PhilippHofer/rot into upgrade-deps philipp 2023-09-05 13:43:47 +02:00
• 6e68e71369 update deps philipp 2023-09-05 13:28:30 +02:00
• c23d22d027 install npm philipp 2023-09-05 13:41:11 +02:00
• 39a9347bab use new nodejs philipp 2023-09-05 13:38:53 +02:00
• 6bdb2610bd update deps philipp 2023-09-05 13:28:30 +02:00
• 71ec5ce01a
  Merge branch 'staging' into 'main' PhilippHofer 2023-09-05 11:27:30 +00:00
• 689ff36534 don't be too funny philipp 2023-09-05 13:21:18 +02:00
• c5f3c8d1f3 push philipp 2023-09-05 13:20:42 +02:00
• d07581aa3d [TASK] replace Freitag with Markttag for phipsi Marie Birner 2023-04-10 22:56:47 +02:00
• 31435e9c3b rename labels philipp 2023-08-09 23:39:11 +02:00
• 662f952807 Merge branch 'allow_to_add_real_guests' into 'staging' PhilippHofer 2023-08-09 20:30:37 +00:00
• 590b41aa33 Allow to add real guests PhilippHofer 2023-08-09 20:30:37 +00:00
• 723ada09b0 update deps philipp 2023-08-09 13:43:51 +02:00
• 4acefb3749 fix typo philipp 2023-08-09 12:43:30 +02:00
• 5deece48ea Merge branch 'staging' into 'main' PhilippHofer 2023-08-09 10:15:38 +00:00
• 0afd523e05 update faq philipp 2023-08-09 12:01:49 +02:00
• bd4ee5954c implement is_locked for trip_details philipp 2023-08-09 11:54:18 +02:00
• 21c5609b31 set test logbook data philipp 2023-08-05 16:58:20 +02:00
• f0c6bdac14 fix ci; clean code philipp 2023-08-05 16:29:58 +02:00
• 94a9d285be clean db philipp 2023-08-05 16:27:51 +02:00
• 64aefde8bc fix stat query philipp 2023-08-05 15:58:17 +02:00
• 7309b1f2b2 update unit tests; add location name in kiosk settting to cookie (to avoid specific redirects) philipp 2023-08-05 13:21:35 +02:00
• e459a4e2d9 store loation in kiosk cookie, to avoid having to handle each location separately philipp 2023-08-05 13:09:58 +02:00
• 351ba1ba4e fix tests, default redirect to linz kiosk philipp 2023-08-05 13:01:01 +02:00
• 23844243b8 Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging philipp 2023-08-05 12:59:23 +02:00
• 8a40dfe017 allow filter for kiosk, to only show boats at specific location philipp 2023-08-05 12:59:02 +02:00
• d556e67cee Merge branch 'staging' into 'main' PhilippHofer 2023-08-05 10:51:56 +00:00
• 2192bb73ed Merge branch 'fix-order-trips' into 'staging' PhilippHofer 2023-08-05 10:38:58 +00:00
• 6809a85749 add option to lock boat on damage philipp 2023-08-05 12:05:54 +02:00
• f3c18c6949 update mail address philipp 2023-08-02 18:36:38 +02:00
• 8eb8597293 allow optional different table in staging philipp 2023-08-02 15:02:03 +02:00
• ff31ad83fe add boatdamages functionality philipp 2023-08-02 14:29:19 +02:00
• f7e623b8c3 strip binary philipp 2023-08-01 14:53:06 +02:00
• f2baca668c add tests for tera/admin/planned_event philipp 2023-07-31 21:33:49 +02:00
• da6a16cd66 add tests for tera/admin/planned_event philipp 2023-07-31 21:29:03 +02:00
• 8fa8e17c5a add tests for tera/admin/planned_event philipp 2023-07-31 21:15:28 +02:00
• 96af3c3b17 create tests for /public philipp 2023-07-31 21:07:01 +02:00
• 91ffcbb720 Merge branch 'fix-order-trips' of gitlab.com:PhilippHofer/rot into fix-order-trips philipp 2023-07-31 20:12:56 +02:00
• 5b8dfb8284 fix order of displayed trips + events philipp 2023-07-31 08:18:37 +02:00
• 3730940aed add tests for tera/log.rs philipp 2023-07-31 20:09:03 +02:00
• 8b5be3fb41 add test for tera/admin/boat.rs philipp 2023-07-31 19:38:53 +02:00
• 47b534f8c3 create tests for model/logbook philipp 2023-07-31 19:10:34 +02:00
• adb26f6b91 create tests for model/rower.rs, Closes #32 philipp 2023-07-31 16:59:15 +02:00
• 32e6148844 use query_as instead of manual mapping philipp 2023-07-31 16:33:44 +02:00
• dc4b4b3499 add tests; Closes #30 philipp 2023-07-31 16:25:07 +02:00
• bbb78cbc44 move todos to gitlab; write tests for /cox/remove/<id>; Closes #9 philipp 2023-07-31 13:34:02 +02:00
• c4100e6c68 backup working systemd service files philipp 2023-07-31 12:46:14 +02:00
• a40001f0ad Merge branch 'update-deps' into 'staging' PhilippHofer 2023-07-31 07:33:27 +00:00
• e6800edf68 Merge branch 'staging' into 'main' PhilippHofer 2023-07-31 07:25:34 +00:00
• 8fa81a6f8e update deps philipp 2023-07-31 09:22:41 +02:00
• a79e22e19f add ideas philipp 2023-07-31 09:19:28 +02:00
• b2e84d727c use local timestamp for log philipp 2023-07-31 09:10:26 +02:00
• fa75cf3169 add ideas philipp 2023-07-31 08:24:28 +02:00
• 103e770fa6 fix order of displayed trips + events philipp 2023-07-31 08:18:37 +02:00
• 700ab8110b Merge branch 'remove-static-folder' into 'staging' PhilippHofer 2023-07-31 05:53:25 +00:00
• 727d8d52dd remove static folder philipp 2023-07-31 07:52:57 +02:00
• b5962dcb84 Merge branch 'staging' into 'main' PhilippHofer 2023-07-31 05:51:51 +00:00
• 332b505955 Merge branch 'verify-rower-on-water' into 'staging' PhilippHofer 2023-07-30 21:11:51 +00:00
• 1bff814811 push philipp 2023-07-30 22:59:47 +02:00
• b1a42b2683 Merge branch 'js' into 'staging' Marie Birner 2023-07-30 20:35:58 +00:00
• 5e571b935e Merge branch 'fix-ci' into 'staging' PhilippHofer 2023-07-30 20:35:56 +00:00
• 57d7b35912 fix ci philipp 2023-07-30 22:35:17 +02:00
• 0c0d1ffb00 [TASK] show pretty timestamp Marie Birner 2023-07-30 22:35:16 +02:00
• 4fe17284bb Merge branch 'fix-error-diff-sqlite-version' into 'staging' PhilippHofer 2023-07-30 20:18:11 +00:00
• 7e09c81d5e fix error on diff sqlite version philipp 2023-07-30 22:17:47 +02:00
• 9e413978eb Merge branch 'fix-error-diff-sqlite-version' into 'staging' PhilippHofer 2023-07-30 19:54:54 +00:00
• e3105ca8d7 Merge branch 'styling' into 'staging' PhilippHofer 2023-07-30 19:18:11 +00:00
• 38c53a26f9 Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging philipp 2023-07-30 21:17:12 +02:00
• a3ca996f78 push philipp 2023-07-30 19:56:53 +02:00
• cf897df36f push philipp 2023-07-30 19:37:08 +02:00
• 6029d7b9b6 use new nodejs philipp 2023-07-30 19:35:10 +02:00
• d1dd5372bd push philipp 2023-07-30 19:20:04 +02:00
• 2beff31a71 push philipp 2023-07-30 18:30:56 +02:00
• e701042891 build js philipp 2023-07-30 18:28:01 +02:00
• 838352fcfc strip binary philipp 2023-07-30 18:24:10 +02:00
• c63a2b2032 push philipp 2023-07-30 17:56:32 +02:00
• 88dd0470a2 push philipp 2023-07-30 17:42:01 +02:00
• ee2ae2e35d push philipp 2023-07-30 17:41:34 +02:00
• f40d409c3d push philipp 2023-07-30 17:30:40 +02:00
• f2026d8d84 push philipp 2023-07-30 17:30:11 +02:00
• d334e575b4 push philipp 2023-07-30 17:28:50 +02:00
• 6bc94c1482 push philipp 2023-07-30 17:27:32 +02:00
• 002cd3e6eb push philipp 2023-07-30 17:14:56 +02:00
• cfba5bc856 push philipp 2023-07-30 16:46:57 +02:00
• 36f800d65c push philipp 2023-07-30 16:31:38 +02:00
• ae0ef8e18f push philipp 2023-07-30 16:27:54 +02:00
• 4d53bdb724 push philipp 2023-07-30 16:10:56 +02:00
• 6831ac00b7 push philipp 2023-07-30 16:02:02 +02:00
• b27953dc41 fix philipp 2023-07-30 15:59:51 +02:00
• dc0bd01661 first draft of ci deploy philipp 2023-07-30 15:57:37 +02:00
• 9b270fbbf9 [TASK] show pretty timestamp Marie Birner 2023-07-30 20:53:27 +02:00
• aab8b04811 Merge branch 'styling' of gitlab.com:PhilippHofer/rot into styling philipp 2023-07-30 20:50:37 +02:00
• f3590c1437 fix parsing of sqlite timestamp (arrival) philipp 2023-07-30 20:50:28 +02:00
• 041733a3ba [TASK] set boat status Marie Birner 2023-07-30 20:45:16 +02:00