2811 Commits

Author SHA1 Message Date
e883c0e6e2 Merge pull request 'auto-update-both-branches' (#1025) from auto-update-both-branches into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#1025
2025-05-15 22:26:24 +02:00
4bcba1ec47 auto update both branches 2025-05-15 22:25:27 +02:00
452a1e1b97 Merge pull request 'fix ci' (#1024) from fix/ci into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#1024
2025-05-14 23:46:06 +02:00
d2390ca5c2 Merge pull request 'fix/ci' (#1023) from fix/ci into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#1023
2025-05-14 23:45:29 +02:00
412b733e30 fix ci 2025-05-14 23:44:53 +02:00
965cba0919 Merge pull request 'improve logging' (#1022) from improve-logging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#1022
2025-05-14 23:01:39 +02:00
4906b757b8 Merge pull request 'improve logging' (#1021) from improve-logging into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#1021
2025-05-14 23:01:12 +02:00
dae8632a34 improve logging 2025-05-14 23:00:17 +02:00
55bdca4238 Merge pull request 'add auto-update; Progress at #503' (#1020) from auto-update into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#1020
2025-05-14 08:31:49 +02:00
0b62f59d19 Merge pull request 'add auto-update; Progress at #503' (#1019) from auto-update into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#1019
2025-05-14 08:31:42 +02:00
bf7dab235c add auto-update; Progress at #503 2025-05-14 08:31:04 +02:00
bb3e8dadb7 Merge pull request 'not so much clutter when addding notes' (#1018) from nicer-notes into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#1018
2025-05-14 08:15:57 +02:00
924683511c Merge pull request 'nicer-notes' (#1016) from nicer-notes into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#1016
2025-05-14 08:15:46 +02:00
ed6d05eb9e not so much clutter when addding notes 2025-05-14 08:04:56 +02:00
edcdc74c1c Merge pull request 'start replacing activitybuilder' (#1015) from acitvities-adaption into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#1015
2025-05-12 23:09:46 +02:00
d7d6eb2b43 Merge pull request 'start replacing activitybuilder' (#1014) from acitvities-adaption into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#1014
2025-05-12 23:09:27 +02:00
3ab1dbd1f1 start replacing activitybuilder 2025-05-12 23:08:45 +02:00
6e9367fa07 Merge pull request 'prepare to remove old log, in favor of activities' (#1013) from acitvities-adaption into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#1013
2025-05-12 22:32:19 +02:00
4859890389 Merge pull request 'prepare to remove old log, in favor of activities' (#1012) from acitvities-adaption into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#1012
2025-05-12 22:32:04 +02:00
e4a8caf632 prepare to remove old log, in favor of activities 2025-05-12 22:29:34 +02:00
cd39f1a694 Merge pull request 'clean duplicate speicifications' (#1009) from clean-backend-code into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#1009
2025-05-11 20:56:11 +02:00
4f34cc180c Merge pull request 'clean-backend-code' (#1008) from clean-backend-code into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#1008
2025-05-11 20:55:49 +02:00
396fc8e659 clean duplicate speicifications 2025-05-11 20:52:13 +02:00
f86d2f6307 Merge pull request 'fix notification' (#1007) from fix-notification into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#1007
2025-05-10 15:48:39 +02:00
3c26381901 Merge pull request 'fix-notification' (#1006) from fix-notification into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#1006
2025-05-10 15:48:34 +02:00
1ecde79593 fix notification 2025-05-10 15:47:25 +02:00
e8b8ba393f Merge pull request 'inform new cox about things' (#1004) from informat-new-cox into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#1004
2025-05-09 13:06:29 +02:00
e01f9806bd Merge pull request 'inform new cox about things' (#1003) from informat-new-cox into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#1003
2025-05-09 13:05:31 +02:00
3801c7ce8c inform new cox about things 2025-05-09 13:04:51 +02:00
816257d4be Merge pull request 'remove notes from users (switched to activity)' (#1002) from remove-notes into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#1002
2025-05-09 08:57:45 +02:00
71087af0df Merge pull request 'remove-notes' (#1001) from remove-notes into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#1001
2025-05-09 08:45:15 +02:00
23399b7757 remove notes from users (switched to activity) 2025-05-09 08:44:17 +02:00
0c5812f725 Merge pull request 'show all activities for admin; Fixes #984' (#1000) from show-all-activities into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#1000
2025-05-09 08:32:33 +02:00
6efcaaccf9 Merge pull request 'show-all-activities' (#999) from show-all-activities into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#999
2025-05-09 08:32:14 +02:00
d88a35bb82 show all activities for admin; Fixes #984 2025-05-09 08:30:09 +02:00
52abcbb3fb Merge pull request 'show proper text for all who have acheived diamond equatorprice' (#998) from fix-diamond-text into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#998
2025-05-07 13:44:47 +02:00
60578dfaba Merge pull request 'fix-diamond-text' (#997) from fix-diamond-text into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#997
2025-05-07 13:44:43 +02:00
29777cdc36 show proper text for all who have acheived diamond equatorprice 2025-05-07 13:43:57 +02:00
22b9a2e324 Merge pull request '[TASK] add search bar and improve ux' (#996) from improve-role-view into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#996
2025-05-07 13:06:39 +02:00
addf0f437b Merge pull request 'improve-role-view' (#995) from improve-role-view into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#995
2025-05-07 13:06:33 +02:00
a97d515f03 lint 2025-05-07 13:06:02 +02:00
Marie Birner
72fc3ed91e [TASK] add search bar and improve ux 2025-05-07 11:52:58 +02:00
b079eafc3d Merge pull request 'update deps' (#994) from upd into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#994
2025-05-06 22:51:56 +02:00
51df7f2d1e Merge pull request 'upd' (#993) from upd into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#993
2025-05-06 22:51:06 +02:00
6e1bfe8635 update deps 2025-05-06 22:49:51 +02:00
ce28f93d65 Merge pull request 'single-user-edit-page' (#992) from single-user-edit-page into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#992
2025-05-06 13:43:23 +02:00
78faf1b0db Merge pull request 'single-user-edit-page' (#991) from single-user-edit-page into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#991
2025-05-06 13:40:59 +02:00
bf3a4c686a Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page 2025-05-06 13:40:39 +02:00
5fb9e0fbba format 2025-05-06 13:40:33 +02:00
e3fc756b3f Merge pull request 'single-user-edit-page' (#990) from single-user-edit-page into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#990
2025-05-06 10:14:55 +02:00