philipp/hacky-ruadat
1
0
Fork 0
forked from Ruderverein-Donau-Linz/rowt
Code Issues Pull Requests Actions Activity

Rebase from rowt #6

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

No dependencies set.

Reference: philipp/hacky-ruadat#6
Delete Branch "upd"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?