1766 Commits

Author SHA1 Message Date
b3779bfefd Merge pull request 'faster tests' () from staging into main
Reviewed-on: 
2024-03-05 00:46:42 +01:00
212ef5faa7 faster tests 2024-03-05 00:46:19 +01:00
5cbdb2ae63 Merge pull request 'remove 1 minute timeout + use local timezone where appropriate and fix tests between 0 and 1 o'clock' () from staging into main
Reviewed-on: 
2024-03-05 00:17:56 +01:00
5078c5f341 use local timezone where appropriate and fix tests between 0 and 1 o'clock 2024-03-05 00:17:02 +01:00
38d4899bf4 Merge pull request 'staging' () from staging into main
Reviewed-on: 
2024-03-04 23:12:05 +01:00
007b87e8ad add scheckbook functionality, Fixes ()
Reviewed-on: 
2024-03-04 23:11:44 +01:00
c813e2b3da scheckbuch people don't get error 2024-03-04 22:04:22 +01:00
eed7718a3f Merge pull request 'alphabetically order stat if same ranking' () from staging into main
Reviewed-on: 
2024-03-04 17:12:40 +01:00
4a81d2d624 alphabetically order stat if same ranking 2024-03-04 17:12:16 +01:00
2bff90b025 Merge pull request 'staging' () from staging into main
Reviewed-on: 
2024-03-04 17:01:53 +01:00
842cc00812 Merge branch 'staging' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into staging 2024-03-04 17:01:33 +01:00
ff6d8adefd add new functionality to menu 2024-03-04 17:01:25 +01:00
2490428781 Merge pull request 'Create admin function to use copy-pasted users from ekey, return the ones which don't match to "Donau Linz" rowt user, Fixes ()' () from staging into main
Reviewed-on: 
2024-03-04 17:00:06 +01:00
05b7b7fbbf Create admin function to use copy-pasted users from ekey, return the ones which don't match to "Donau Linz" rowt user, Fixes ()
Reviewed-on: 
2024-03-04 16:59:44 +01:00
a269efedca Merge pull request 'show user icon in all vorstand users' () from staging into main
Reviewed-on: 
2024-03-04 16:38:50 +01:00
8edbf15235 show user icon in all vorstand users 2024-03-04 16:37:53 +01:00
e7168d308f Merge pull request 'fix link' () from staging into main
Reviewed-on: 
2024-03-04 15:57:34 +01:00
b6a318df85 fix link 2024-03-04 15:57:06 +01:00
11188bacbe Merge pull request 'reformat files' () from staging into main
Reviewed-on: 
2024-03-04 15:51:50 +01:00
a1b5c26518 Merge branch 'main' into staging 2024-03-04 15:18:56 +01:00
dfa0eaeb4f fix ci, more output @ ci 2024-03-04 14:55:11 +01:00
4eeb2162d8 fix spacing issues 2024-03-04 14:28:19 +01:00
df9f1c398b fix spacing issues 2024-03-04 14:26:42 +01:00
62ff5f0c2e fix spacing issues 2024-03-04 14:25:14 +01:00
ee17bc2ab3 fix tests 2024-03-04 14:08:46 +01:00
eb483d9959 also verify logbook entry successfully created 2024-03-04 14:04:13 +01:00
c98170636b show proper amount of guests 2024-03-04 13:35:13 +01:00
442257df01 reformat files 2024-03-04 13:28:42 +01:00
ec5a69f3e6 Merge branch 'notification' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into notification 2024-03-04 10:03:59 +01:00
09fffa1830 add table 2024-03-04 10:03:53 +01:00
28acee3085 notifications 2024-03-04 10:03:53 +01:00
7ce535f500 Merge pull request 'staging' () from staging into main
Reviewed-on: 
2024-03-04 10:03:14 +01:00
e338c78d04 Merge pull request 'allow vorstand to see member details, Fixes ' () from show-members-vorstand into staging
Reviewed-on: 
2024-03-04 09:56:29 +01:00
0de21e9abb add tests and fix npm build, make frontend tests work @ mobile view
Reviewed-on: 
2024-03-04 09:55:39 +01:00
9c3ae7434e allow vorstand to see member details, Fixes 2024-03-04 09:19:04 +01:00
996fcdc14f Merge pull request 'Allow 'Rennjugend' to use all boats in ottensheim, Fixes ' () from ottensheim-boats into staging
Reviewed-on: 
2024-03-03 20:06:29 +01:00
5781937bee show ottensheim boats to rennjugend 2024-03-03 20:03:20 +01:00
d1296ec40a show ottensheim boats to rennjugend 2024-03-03 18:08:15 +01:00
29284b30a6 Merge pull request 'update deps and fix ci' () from staging into main
Reviewed-on: 
2024-03-01 09:09:34 +01:00
cc7ba59407 update deps and fix ci 2024-03-01 09:08:50 +01:00
966254807c Merge pull request 'allow sending mails w/o attachments :-)' () from staging into main
Reviewed-on: 
2024-03-01 08:41:12 +01:00
770e321bed allow sending mails w/o attachments :-) 2024-03-01 08:40:02 +01:00
4f6dacb907 Merge pull request 'use old lock file to make ci work' () from staging into main
Reviewed-on: 
2024-02-21 15:39:22 +01:00
f7a7ab8733 use old lock file to make ci work 2024-02-21 15:35:12 +01:00
4ddac52a93 Merge pull request 'increase timeout for frontend tests' () from staging into main
Reviewed-on: 
2024-02-21 15:08:31 +01:00
65e425fed7 increase timeout for frontend tests 2024-02-21 15:06:35 +01:00
cdd57eb147 Merge pull request 'code cleanup' () from staging into main
Reviewed-on: 
2024-02-21 14:47:54 +01:00
6ed28994c6 code cleanup 2024-02-21 14:46:17 +01:00
4a0026a9ee Merge pull request 'staging' () from staging into main
Reviewed-on: 
2024-02-21 13:58:29 +01:00
e9bee963fe update deps 2024-02-21 13:58:03 +01:00