2094 Commits

Author SHA1 Message Date
07b197cc63 check changing of handoperated in backend 2024-04-24 15:25:42 +02:00
a1ebd59f22 calc general boat cat 2024-04-24 15:12:27 +02:00
aac7444896 Merge pull request 'handoperatable-feature' () from handoperatable-feature into main
Reviewed-on: 
2024-04-24 14:43:24 +02:00
d646996c80 Merge branch 'main' into handoperatable-feature 2024-04-24 12:21:07 +02:00
1412852087 Merge pull request 'handoperatable-feature' () from handoperatable-feature into staging
Reviewed-on: 
2024-04-24 12:19:06 +02:00
5f5f215aad Merge pull request 'switch to smarter ci cache, which knows intricacies of rust; e.g. auto deletes unused deps' () from smarter-ci-cache into main
Reviewed-on: 
2024-04-24 12:04:26 +02:00
7a59c67763 Merge pull request 'smarter-ci-cache' () from smarter-ci-cache into staging
Reviewed-on: 
2024-04-24 12:04:22 +02:00
a2b0146d6d fix ci 2024-04-24 11:57:26 +02:00
7f813823f3 switch to smarter ci cache, which knows intricacies of rust; e.g. auto deletes unused deps 2024-04-24 10:14:11 +02:00
d91baeb7bc Merge branch 'staging' into handoperatable-feature 2024-04-24 09:56:47 +02:00
b5cdc8827a Merge pull request 'format-tera' () from format-tera into staging
Reviewed-on: 
2024-04-24 09:47:57 +02:00
b6b88ead37 Merge branch 'staging' into format-tera 2024-04-24 09:46:54 +02:00
6b3851bfe4 Merge pull request 'format tera w/ linter' () from format-tera into main
Reviewed-on: 
2024-04-24 09:46:19 +02:00
a0dbd0f490 implement first draft of switching handoperatable boats 2024-04-24 09:37:45 +02:00
3f80cb498c format tera w/ linter 2024-04-24 08:57:41 +02:00
7ba5070df3 Merge pull request 'group-reservations-in-log' () from group-reservations-in-log into main
Reviewed-on: 
2024-04-24 08:53:52 +02:00
cc1a7106cb Merge pull request 'group-reservations-in-log' () from group-reservations-in-log into staging
Reviewed-on: 
2024-04-24 08:51:38 +02:00
d4218289f0 fix ci 2024-04-24 08:27:54 +02:00
349a9f843c fix ci 2024-04-24 07:39:44 +02:00
982bb3b5c8 Merge pull request 'fix ci' () from fix-ci into main
Reviewed-on: 
2024-04-24 07:21:34 +02:00
b4f38089ee Merge pull request 'fix-ci' () from fix-ci into staging
Reviewed-on: 
2024-04-24 07:20:50 +02:00
e22dd8eb51 fix ci 2024-04-24 07:20:16 +02:00
ac9c4b256e Merge pull request 'allow-reservation-edits' () from allow-reservation-edits into main
Reviewed-on: 
2024-04-23 23:23:10 +02:00
cfec4ef8b3 Merge branch 'main' into allow-reservation-edits 2024-04-23 23:10:02 +02:00
a424e79cba Merge pull request 'allow-reservation-edits' () from allow-reservation-edits into staging
Reviewed-on: 
2024-04-23 23:05:47 +02:00
Marie Birner
be24001b4b Merge branch 'allow-reservation-edits' into staging
# Conflicts:
#	src/tera/boatreservation.rs
2024-04-23 23:04:46 +02:00
Marie Birner
d9885f9bba [TASK] change padding form 2024-04-23 22:58:48 +02:00
Marie Birner
6c2e0669d5 [TASK] improve sorting boats in schnellauswahl 2024-04-23 22:46:05 +02:00
Marie Birner
e556b1375d [TASK] improve styling boat list 2024-04-23 22:39:59 +02:00
Marie Birner
23a623bdc9 [TASK] add etsch edge case js 2024-04-23 22:36:51 +02:00
Marie Birner
b1d48a5154 [TASK] improve sidebar css 2024-04-23 22:35:52 +02:00
61261c9816 allow edits of boatreservations, Fixes 2024-04-23 22:23:24 +02:00
f993eae27f Merge pull request 'add script to fetch current db' () from fetch-db-script into main
Reviewed-on: 
2024-04-23 21:12:37 +02:00
f1ee266288 Merge pull request 'add script to fetch current db' () from fetch-db-script into staging
Reviewed-on: 
2024-04-23 21:12:14 +02:00
9aefc814a7 Merge pull request '[TASK] group reservations in log to avoid near-duplicates' () from group-reservations-in-log into main
Reviewed-on: 
2024-04-23 21:11:42 +02:00
548c025fbc Merge pull request '[TASK] group reservations in log to avoid near-duplicates' () from group-reservations-in-log into staging
Reviewed-on: 
2024-04-23 21:11:18 +02:00
8f44fdadf2 add script to fetch current db 2024-04-23 21:10:04 +02:00
3abff08f61 [TASK] group reservations in log to avoid near-duplicates 2024-04-23 20:40:06 +02:00
32dee2c320 Merge pull request 'allow to upload membership pdf for users which don't have it' () from allow-membership-uploads into main
Reviewed-on: 
2024-04-22 10:37:49 +02:00
3c67e0deeb Merge pull request 'allow to upload membership pdf for users which don't have it' () from allow-membership-uploads into staging
Reviewed-on: 
2024-04-22 10:37:09 +02:00
ef21e719c8 allow to upload membership pdf for users which don't have it 2024-04-22 10:36:47 +02:00
4a7cd2f085 Merge pull request 'update deps' () from update-deps into main
Reviewed-on: 
2024-04-19 16:38:31 +02:00
27b124cce5 Merge pull request 'update deps' () from update-deps into staging
Reviewed-on: 
2024-04-19 16:38:23 +02:00
254e8b7063 update deps 2024-04-19 16:36:42 +02:00
31d45d6ab4 Merge pull request 'notification-badge' () from notification-badge into main
Reviewed-on: 
2024-04-19 16:36:16 +02:00
c122dea6a9 Merge pull request 'notification-badge' () from notification-badge into staging
Reviewed-on: 
2024-04-19 15:54:58 +02:00
2ad5f0883c make clicking on 'create trip' button more robust (clicked on notification as this was the first .relative element 2024-04-19 15:33:44 +02:00
8f2d1ef6f4 wait until dev server started for frontend tests 2024-04-19 15:04:03 +02:00
d6214d5369 fix comma issue 2024-04-19 13:17:22 +02:00
74ededf913 fix ci 2024-04-19 13:09:17 +02:00