Commit Graph

1919 Commits

Author SHA1 Message Date
philipp 353b413d9f Merge pull request 'update deps' (#180) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#180
2024-01-22 22:39:17 +01:00
philipp 083ddeadc1 update deps 2024-01-22 22:34:54 +01:00
philipp 2e3be062c6 Merge pull request 'staging' (#178) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#178
2024-01-22 22:24:24 +01:00
philipp 6d61d1f8bc Merge branch 'main' into staging 2024-01-22 22:08:39 +01:00
philipp b7499bd6cb clean code; if logged out: save url where user tried to go to, go there once logged in, Fixes #179 2024-01-22 22:08:05 +01:00
philipp 60b9a4dbba adapt unit tests to account for new redirect 2024-01-22 20:55:05 +01:00
philipp a1a5e2ad89 move managing events to own role 2024-01-22 19:27:22 +01:00
philipp eda072c713 enable changing paid state 2024-01-22 19:05:18 +01:00
philipp 4a06d519bf Merge pull request 'staging' (#177) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#177
2024-01-21 16:10:32 +01:00
philipp ac5ecbafec Merge branch 'staging' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into staging 2024-01-21 16:09:53 +01:00
philipp c54efdeec4 add spacing 2024-01-21 16:09:43 +01:00
philipp 491b2cac82 Merge pull request 'main' (#176) from main into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#176
2024-01-21 16:08:47 +01:00
philipp 5f31c565a3 Merge pull request 'trim mails' (#175) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#175
2024-01-21 16:08:10 +01:00
philipp 6a22811ad9 trim mails 2024-01-21 16:07:11 +01:00
philipp 7c7163f541 Merge pull request 'staging' (#174) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#174
2024-01-21 16:01:22 +01:00
philipp f4cb051b84 fix mail error 2024-01-21 16:00:41 +01:00
philipp 2032b7e0db Merge pull request 'main' (#173) from main into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#173
2024-01-19 11:58:41 +01:00
philipp 83c7b45139 Merge pull request 'staging' (#172) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#172
2024-01-19 11:58:05 +01:00
philipp 7f7259a3e1 improve texts 2024-01-19 11:56:49 +01:00
philipp 99e3aa22a2 fix errors 2024-01-19 11:47:28 +01:00
philipp 0ed740ec47 create fee reminder mail 2024-01-19 11:19:24 +01:00
philipp 578e3df9e9 use text instead of creditor id in qr code, more clear that fee is for full family 2024-01-19 10:22:13 +01:00
philipp 3a8650028d add qr code for payment 2024-01-19 10:10:23 +01:00
philipp c036cda593 Merge pull request 'remove wrong header' (#171) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#171
2024-01-19 08:48:29 +01:00
philipp f1ba331fdf remove wrong header 2024-01-19 08:47:49 +01:00
philipp 14a5952e14 Merge pull request 'group families in fee calc' (#170) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#170
2024-01-19 08:02:59 +01:00
philipp e498b4be3b group families in fee calc 2024-01-19 08:02:09 +01:00
philipp ae8887c72d Merge pull request 'staging' (#169) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#169
2024-01-19 07:43:05 +01:00
philipp 519cd1985d Merge pull request 'final' (#168) from final into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#168
2024-01-19 01:00:07 +01:00
philipp 3df6791b6b fix ci 2024-01-19 00:50:30 +01:00
philipp cb892e1c0c remove unnecessary field 2024-01-19 00:46:51 +01:00
philipp b893989dce handle supporing fees 2024-01-19 00:44:53 +01:00
philipp 267becfbce progress @fees, next step, deply+enter families/student/pupil/... 2024-01-19 00:39:15 +01:00
philipp ff795ce66c start with fee calc 2024-01-18 22:02:44 +01:00
philipp 474db1232d start working on calculating member fees 2024-01-18 21:36:38 +01:00
philipp dc794bde37 try 2024-01-18 16:55:51 +01:00
philipp 85124cd699 Merge pull request 'add family' (#167) from family into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#167
2024-01-18 16:38:33 +01:00
philipp 07c76f4e64 add family 2024-01-18 16:37:54 +01:00
philipp 357ee21533 add notes 2024-01-18 15:28:51 +01:00
philipp 66365c4a68 fix typo 2024-01-18 09:32:25 +01:00
philipp 3cd4807604 Delete package-lock.json 2024-01-17 23:49:28 +01:00
philipp e9dfce5c95 Delete shame.txt 2024-01-17 23:48:43 +01:00
philipp 6de5d70b64 Delete update.sh 2024-01-17 23:48:26 +01:00
philipp 1c21d3ad65 Merge pull request 'own-dockerfile' (#166) from own-dockerfile into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#166
2024-01-17 23:43:24 +01:00
philipp fd99bc6f66 push 2024-01-17 23:42:07 +01:00
philipp c5673559d0 try 2024-01-17 23:41:08 +01:00
philipp 54f9dc22e0 try 2024-01-17 23:40:49 +01:00
philipp 9267b4dbc8 try 2024-01-17 23:40:48 +01:00
philipp 6e8947a928 try 2024-01-17 23:39:57 +01:00
philipp 0ab121df8e try 2024-01-17 23:39:55 +01:00