2829 Commits

Author SHA1 Message Date
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
Marie Birner
f58e7d1307 Merge commit '374fed9e3bdcee30a3f8315d1f0c392204a885df' into single-user-edit-page 2025-05-06 09:57:02 +02:00
374fed9e3b fix tests by clicking on boat name instead of cox 2025-05-06 08:50:45 +02:00
Marie Birner
b9f2382cba [BUGFIX] buttons mobile margin 2025-05-06 07:45:32 +02:00
Marie Birner
aab3a15488 [BUGFIX] back link margin bottom mobile 2025-05-06 07:44:12 +02:00
83b93fba09 Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page 2025-05-05 22:24:32 +02:00
3b5ff70d1d don't clutter acitvities toooooo much 2025-05-05 22:23:28 +02:00
2af9ac20b1 Merge pull request '[TASK] add icons to add new user and improve ui in setting a fixed height in activity log' (#989) from improve-user-view into single-user-edit-page
Reviewed-on: Ruderverein-Donau-Linz/rowt#989
2025-05-05 22:16:11 +02:00
Marie Birner
5331ac71fa [TASK] add icons to add new user and improve ui in setting a fixed height in activity log 2025-05-05 22:12:19 +02:00
6098aedb74 fix tests? 2025-05-05 22:11:56 +02:00
Marie Birner
af2e7cb557 Merge commit '17513bbc386e849962157517d9a4496870b1a064' into single-user-edit-page 2025-05-05 21:14:41 +02:00
Marie Birner
81b99ef414 [TASK] edit form on logbook fixes #635 2025-05-05 21:14:23 +02:00
17513bbc38 give frontend stuff to be able to update logbook entriese 2025-05-05 21:11:41 +02:00
c1cecf3b20 don't panic on 'external cox' 2025-05-05 20:46:41 +02:00
8e40e563c6 even less clutter! 2025-05-05 20:44:00 +02:00
Marie Birner
bb78441cc4 Merge branch 'single-user-edit-page' of https://git.hofer.link/Ruderverein-Donau-Linz/rowt into single-user-edit-page 2025-05-05 20:37:45 +02:00
Marie Birner
abcf46281b [TASK] style detail view user 2025-05-05 20:37:29 +02:00
c460494be8 Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page 2025-05-05 20:37:20 +02:00
7083d27644 Merge pull request 'single-user-edit-page' (#986) from single-user-edit-page into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#986
2025-05-05 20:37:12 +02:00
e5560ba536 don't clutter acitvities too much 2025-05-05 20:37:12 +02:00
Marie Birner
b7094bff06 Merge branch 'single-user-edit-page' of https://git.hofer.link/Ruderverein-Donau-Linz/rowt into single-user-edit-page 2025-05-05 20:21:11 +02:00
Marie Birner
6b8b4ba1d2 [TASK] style new user action in list view 2025-05-05 20:20:52 +02:00
03f76b1ae5 Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page 2025-05-05 20:01:48 +02:00
1864ea260c allow to edit roles 2025-05-05 20:01:32 +02:00
Marie Birner
35a5a55140 [TASK] change background color dark view 2025-05-05 19:44:11 +02:00
9a4dcc0b9d create activity for 'user deleted'; Fixes #985 2025-05-05 18:23:31 +02:00
8277ef6af8 Merge pull request 'allow to create users' (#978) from single-user-edit-page into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#978
2025-05-05 12:05:47 +02:00
43074b3bd7 fix err if scheckbuch has already paid 2025-05-05 11:49:26 +02:00
933e407c64 update prod db :-) 2025-05-05 11:41:32 +02:00
d9e86bf43b allow to create users 2025-05-05 11:35:38 +02:00
67d5df9c18 Merge pull request 'Fill acitivites from various activities; Fixes #972' (#977) from single-user-edit-page into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#977
2025-05-04 19:05:38 +02:00
ebbb4fe3da don't create activity, e.g. for paid-changes, as this is already logged 2025-05-04 18:48:14 +02:00
9178476013 improve string 2025-05-04 18:41:50 +02:00