Rebase from rowt #6

Merged
philipp merged 129 commits from upd into main 2025-04-03 17:11:50 +02:00

129 Commits

Author SHA1 Message Date
1e70e798af have new 'read all notifications' button
Some checks failed
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2025-04-03 17:06:18 +02:00
ecf73f72e5 fix minor mistakes during merge
Some checks failed
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2025-04-03 17:03:11 +02:00
ab7ec637ab Merge remote-tracking branch 'upstream/main' into upd 2025-04-03 16:58:43 +02:00
f0a86a7186 Merge pull request 'fix kiosk error' (#886) from fix-kiosk-error into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#886
2025-03-26 20:58:15 +01:00
18d9f51354 fix kiosk error 2025-03-26 20:56:39 +01:00
dfe39cdd13 Merge pull request 'update deps' (#884) from upd into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#884
2025-03-26 14:52:08 +01:00
3a1ff3189d update deps 2025-03-26 14:51:10 +01:00
a89d78160d Merge pull request 'update id's' (#882) from add-unit-test into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#882
2025-03-09 19:21:41 +01:00
86e5482c6f update id's 2025-03-09 19:20:56 +01:00
08283dd392 Merge pull request 'add unit test for previous bug' (#880) from add-unit-test into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#880
2025-03-09 19:18:44 +01:00
2003ff0e59 add unit test for previous bug 2025-03-09 19:17:34 +01:00
1471ccad2c Merge pull request 'correct-name-in-notification' (#877) from correct-name-in-notification into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#877
2025-03-09 13:34:42 +01:00
d1102a7b04 show proper name in notification 2025-03-09 13:31:12 +01:00
faa8b4e767 Merge branch 'main' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt 2025-03-06 10:25:55 +01:00
bed4b4eb44 Merge pull request 'update deps' (#873) from update-deps into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#873
2025-03-06 10:25:03 +01:00
1ca0de1dd3 push 2025-03-06 10:18:34 +01:00
40bc866b3e push 2025-03-06 10:15:49 +01:00
13c9c5a708 push 2025-03-06 10:14:36 +01:00
d4b99f67ac push 2025-03-06 10:11:34 +01:00
b189c4f203 push 2025-03-06 10:10:33 +01:00
4820f8c798 push 2025-03-06 10:09:51 +01:00
7b2c47613c try 2025-03-06 10:07:35 +01:00
0a81489fa3 more updates 2025-03-06 10:06:54 +01:00
31a7643d96 update deps 2025-03-06 10:04:11 +01:00
83796a9824 test 2025-02-21 10:59:54 +01:00
227c751f60 test 2025-02-21 10:55:41 +01:00
ee5a1202fd test 2025-02-21 10:42:39 +01:00
7f824ccd2f test 2025-02-21 10:42:09 +01:00
e3d8a47af0 test 2025-02-21 10:40:46 +01:00
9f35920f3c test 2025-02-21 10:39:03 +01:00
58e3140376 fetch new ci image 2025-02-21 10:33:36 +01:00
b86043bba5 update deps 2025-02-20 18:18:48 +01:00
e141bcfc37 Merge pull request 'name proper mail addresses' (#871) from remove-philipp-mentioning into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#871
2025-02-17 22:59:01 +01:00
eaa35fb46c name proper mail addresses 2025-02-17 22:55:48 +01:00
86470da184 Merge pull request 'update deps' (#869) from update-deps into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#869
2025-02-13 10:07:01 +01:00
82a54bdea1 update deps 2025-02-13 10:06:04 +01:00
2a37bcbec5 Merge pull request 'upd' (#864) from upd into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#864
2025-02-12 07:13:13 +01:00
c96cc4b38f Merge branch 'upd' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into upd 2025-02-11 21:39:28 +01:00
3008264261 fix default sort 2025-02-11 21:39:06 +01:00
Marie Birner
11025738bb [TASK] improve user management ux 2025-02-11 21:29:54 +01:00
Marie Birner
31fc0605d9 [TASK] improve user management ux 2025-02-11 21:28:28 +01:00
Marie Birner
1fdec59f77 [TASK] add sort element user management 2025-02-11 21:12:30 +01:00
da793fec2d allow sorting of user 2025-02-11 20:23:18 +01:00
8917629613 use proper permissions 2025-02-11 19:30:09 +01:00
2a2c2ce9dc Merge pull request 'fix ci' (#863) from allow-secretary-to-edit-boats into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#863
2025-02-11 09:37:24 +01:00
10f6268e56 fix ci 2025-02-11 09:36:44 +01:00
f0ea5823ba Merge pull request 'allow vorstand to edit boats' (#861) from allow-secretary-to-edit-boats into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#861
2025-02-11 09:23:56 +01:00
3406b66f41 allow vorstand to edit boats 2025-02-11 09:22:22 +01:00
2ffddda960 Merge pull request 'staging' (#858) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#858
2025-02-10 18:48:54 +01:00
c7c92c83fb Merge pull request 'fix ci' (#856) from allow-secretary-to-edit-boats into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#856
2025-02-10 18:48:22 +01:00
5cc77c39ff Merge branch 'staging' into allow-secretary-to-edit-boats 2025-02-10 18:47:59 +01:00
80d8857c6b Merge pull request 'fix ci' (#857) from allow-secretary-to-edit-boats into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#857
2025-02-10 18:47:28 +01:00
78403e4ec5 Merge branch 'main' into allow-secretary-to-edit-boats 2025-02-10 18:46:04 +01:00
4dd656f566 fix ci 2025-02-10 18:44:01 +01:00
23a1a118a3 Merge pull request 'allow 'schriftführer' to edit boats' (#854) from allow-secretary-to-edit-boats into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#854
2025-02-10 18:17:31 +01:00
b281201906 Merge pull request 'allow-secretary-to-edit-boats' (#855) from allow-secretary-to-edit-boats into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#855
2025-02-10 18:17:25 +01:00
4d58bd3cae allow 'schriftführer' to edit boats 2025-02-10 18:16:31 +01:00
67e790a82e Merge pull request 'fix-new-npm' (#853) from fix-new-npm into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#853
2025-01-10 14:35:40 +01:00
63bf1015cc Merge pull request 'Update frontend/tests/cox.spec.ts' (#852) from fix-new-npm into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#852
2025-01-10 14:34:34 +01:00
352dad8e6c Update frontend/tests/cox.spec.ts 2025-01-10 14:16:05 +01:00
4f42e7cb8c Merge pull request 'use new rust in ci' (#851) from update-rust into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#851
2025-01-10 12:47:30 +01:00
c6aa25fe0e Merge pull request 'use new rust in ci' (#850) from update-rust into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#850
2025-01-10 12:47:23 +01:00
9ba848cbab use new rust in ci 2025-01-10 12:46:43 +01:00
9047459d6c Merge pull request 'vorstand-show-old-logs' (#849) from vorstand-show-old-logs into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#849
2025-01-10 10:23:30 +01:00
87de3859a2 Merge pull request 'allow vorstand to see all old logs' (#848) from vorstand-show-old-logs into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#848
2025-01-10 09:52:56 +01:00
b8aaf5ba2e allow vorstand to see all old logs 2025-01-10 09:51:43 +01:00
de9ea9405e Merge pull request 'update-deps' (#847) from update-deps into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#847
2025-01-09 17:23:53 +01:00
3bd229554b Merge pull request 'update-deps' (#846) from update-deps into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#846
2025-01-09 17:04:02 +01:00
f9c9f7c523 update to sqlx 0.8 2025-01-09 16:31:53 +01:00
0dfceec737 update deps 2025-01-09 16:22:08 +01:00
e5fec411f3 Merge pull request 'notfiication-on-new-personal-stat' (#843) from notfiication-on-new-personal-stat into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#843
2025-01-09 16:19:37 +01:00
ac67c6cfdb Merge pull request 'ped clippy' (#845) from notfiication-on-new-personal-stat into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#845
2025-01-09 15:36:34 +01:00
a90c4fc07e ped clippy 2025-01-09 15:35:57 +01:00
52b960cec7 Merge pull request 'cargo clippy' (#844) from notfiication-on-new-personal-stat into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#844
2025-01-09 15:32:26 +01:00
f7d109f1b2 cargo clippy 2025-01-09 15:31:05 +01:00
63505722f9 Merge pull request 'notfiication-on-new-personal-stat' (#842) from notfiication-on-new-personal-stat into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#842
2025-01-09 11:58:10 +01:00
d21272d4bb send notifiation to user + vorstand if user completes 'äquatorpreis' or 'fahrtenabzeichen'; Fixes #746 2025-01-09 11:45:24 +01:00
97dd7794fb split to separate fee file 2025-01-09 10:37:15 +01:00
cfe99c2f2a Merge pull request 'add confirm dialog before creating a new user' (#841) from confirm-user-creation into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#841
2025-01-09 10:22:58 +01:00
2a3f846c5c Merge pull request 'confirm-user-creation' (#840) from confirm-user-creation into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#840
2025-01-09 10:22:56 +01:00
af4163a065 add confirm dialog before creating a new user 2025-01-09 10:21:44 +01:00
8a9047b3c3 Merge pull request 'reservation-styling' (#839) from reservation-styling into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#839
2025-01-08 14:50:27 +01:00
ebc7c32351 Merge pull request 'reservation-styling' (#838) from reservation-styling into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#838
2025-01-08 14:50:20 +01:00
1a850535ed switch from date to time icon + add 'Reservierung' 2025-01-08 14:46:11 +01:00
99bbb2b088 Merge pull request 'stats' (#836) from stats into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#836
2025-01-07 14:51:16 +01:00
b31209a97a Merge pull request '[TASK] make stats more beautiful' (#837) from stats into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#837
2025-01-07 14:27:59 +01:00
Marie Birner
be4f302a4c [TASK] make stats more beautiful 2025-01-07 14:07:52 +01:00
e5c2bec145 Merge pull request 'stats' (#835) from stats into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#835
2025-01-07 12:58:37 +01:00
0ebcd5a284 allow changing the year in stats again 2025-01-07 11:44:56 +01:00
6237340f72 fix ci 2025-01-07 11:39:36 +01:00
Marie Birner
5b013fe389 [TASK] rm unnecessary personal stat 2025-01-07 10:54:15 +01:00
Marie Birner
022ec6bd5b [TASK] make stats more beautiful 2025-01-07 10:52:46 +01:00
09d4c0abe4 Merge pull request 'show amount of trips in stat' (#834) from show-amount-trips into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#834
2025-01-06 13:15:05 +01:00
5448558085 Merge pull request 'show-amount-trips' (#833) from show-amount-trips into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#833
2025-01-06 13:14:55 +01:00
3232a03d75 show amount of trips in stat 2025-01-06 13:14:19 +01:00
dceb57e370 Merge pull request 'fix count in statistic' (#832) from fix-count into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#832
2025-01-04 10:57:34 +01:00
f68928df00 Merge pull request 'fix-count' (#831) from fix-count into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#831
2025-01-04 10:57:05 +01:00
d3bb050534 fix count in statistic 2025-01-04 10:56:32 +01:00
32b4131aae Merge pull request 'nicer mail text' (#830) from nicer-mail-text into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#830
2025-01-03 12:38:28 +01:00
1d34cb5794 Merge pull request 'nicer-mail-text' (#829) from nicer-mail-text into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#829
2025-01-03 12:38:09 +01:00
8a4d98a90f nicer mail text 2025-01-03 12:36:29 +01:00
Marie Birner
213e9faad4 [TASK] idea reservation styling in planned events view 2025-01-02 11:22:41 +01:00
a9a8207813 Merge pull request 'show boatreservations in planned' (#828) from show-boatreservations-in-planned into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#828
2025-01-01 19:30:58 +01:00
b7b2385264 Merge pull request 'Merge pull request 'fix no 'donau linz' group' (#825) from fix-no-group into main' (#826) from show-boatreservations-in-planned into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#826
2025-01-01 19:29:58 +01:00
b560233acf show boatreservations in planned 2025-01-01 19:05:20 +01:00
d7187a7589 Merge pull request 'fix no 'donau linz' group' (#825) from fix-no-group into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#825
2025-01-01 17:46:26 +01:00
e61b16c389 Merge pull request 'fix-no-group' (#824) from fix-no-group into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#824
2025-01-01 17:45:52 +01:00
2ac8a3155c fix no 'donau linz' group 2025-01-01 17:44:48 +01:00
d01e6ea30b Merge pull request 'allow lazy people to mark all notifcations as read' (#822) from mark-all-notifications-read into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#822
2024-12-19 21:16:40 +01:00
f38ca09eb7 Merge pull request 'allow lazy people to mark all notifcations as read' (#823) from mark-all-notifications-read into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#823
2024-12-19 21:16:31 +01:00
1ad4c31979 allow lazy people to mark all notifcations as read 2024-12-19 21:15:27 +01:00
5e413d2d72 Merge pull request 'add-renntrainer' (#820) from add-renntrainer into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#820
2024-12-17 09:14:18 +01:00
0f8e1158b9 Merge pull request 'add renntrainer role' (#821) from add-renntrainer into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#821
2024-12-17 08:57:29 +01:00
af10399797 add renntrainer role 2024-12-17 08:56:48 +01:00
6344ba720d Merge pull request 'fix-mobile-link' (#818) from fix-mobile-link into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#818
2024-12-06 18:28:49 +01:00
4b1dceb08a Merge pull request 'format' (#816) from format into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#816
2024-12-05 23:40:07 +01:00
cb819c16a3 Merge pull request 'links; Fixes #755' (#815) from links into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#815
2024-12-05 11:16:34 +01:00
08a48cb4d2 Merge pull request 'update ci' (#812) from update-ci into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#812
2024-12-05 10:23:43 +01:00
9c36da32bd Merge pull request 'demo' (#810) from demo into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#810
2024-11-30 22:33:12 +01:00
77444d25ae Merge pull request 'fix' (#808) from fix into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#808
2024-11-27 08:21:48 +01:00
a683af00d0 Merge pull request 'new-link' (#805) from new-link into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#805
2024-11-27 08:14:00 +01:00
766886d857 Merge pull request 'nicer-label' (#803) from nicer-label into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#803
2024-11-25 21:01:38 +01:00
38703321e8 Merge pull request 'ergo-trips' (#801) from ergo-trips into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#801
2024-11-25 12:31:50 +01:00
ec1c717341 Merge pull request 'allow for smaller m' (#799) from trim-ergo into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#799
2024-11-11 23:12:23 +01:00
22bb79bfbd Merge pull request 'allow m in dd' (#797) from trim-ergo into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#797
2024-11-11 23:07:28 +01:00
eba4b77983 Merge pull request 'trim-ergo' (#795) from trim-ergo into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#795
2024-11-11 23:00:08 +01:00
83d266b3e0 Merge pull request 'update data' (#793) from formating-ergo into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#793
2024-11-11 18:03:43 +01:00
980bcff1d9 Merge pull request 'fix tests' (#791) from formating-ergo into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#791
2024-11-11 15:27:15 +01:00
c15ed6e9a9 Merge pull request 'formating-ergo' (#789) from formating-ergo into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#789
2024-11-11 13:34:31 +01:00