2509 Commits

Author SHA1 Message Date
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
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
2485f910fd Merge pull request '[BUGFIX] fix mobille link issue' (#819) from fix-mobile-link into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#819
2024-12-06 18:28:31 +01:00
Marie Birner
4550be5b2a [BUGFIX] fix mobille link issue 2024-12-06 18:16:11 +01:00
9cc0df3a62 Merge pull request 'linting + proper time formatting' (#817) from format into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#817
2024-12-05 23:40:15 +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
267135bf73 linting + proper time formatting 2024-12-05 23:38:36 +01:00
b9c5a87ee7 Merge pull request 'add links' (#814) from links into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#814
2024-12-05 13:35:39 +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
a3d05d93bd add links 2024-12-05 11:15:42 +01:00
a249857331 Merge pull request 'update ci' (#813) from update-ci into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#813
2024-12-05 10:23:48 +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
4a200327a6 update ci 2024-12-05 10:22:45 +01:00
f283240876 Merge pull request 'add demo db for ruad.at' (#811) from demo into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#811
2024-11-30 22:33:25 +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
257cdcf823 add demo db for ruad.at 2024-11-30 22:32:15 +01:00
671a0fc89f Merge pull request 'Revert "adapt to new domain"' (#809) from fix into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#809
2024-11-27 08:21:52 +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
0ad62e2ece Revert "adapt to new domain"
This reverts commit c7b5b7e39d15bda54f53c5e217cb866018aeb257.
2024-11-27 08:20:54 +01:00
85c759d9b7 Merge pull request 'new-link' (#807) from new-link into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#807
2024-11-27 08:20:27 +01:00