2466 Commits

Author SHA1 Message Date
6f7283f754 fix term 2024-06-27 17:10:15 +02:00
323f721fc0 Merge pull request 'order logbook by arrival' () from order-logbook-by-arrival into main
Reviewed-on: 
2024-06-27 08:52:22 +02:00
d0bcf1f384 Merge pull request 'order logbook by arrival' () from order-logbook-by-arrival into staging
Reviewed-on: 
2024-06-27 08:52:17 +02:00
bd7cd0020e order logbook by arrival 2024-06-27 08:51:44 +02:00
22bfe48d18 Merge pull request 'update deps' () from update-deps into main
Reviewed-on: 
2024-06-27 07:59:27 +02:00
c379a6ca79 Merge pull request 'update deps' () from update-deps into staging
Reviewed-on: 
2024-06-27 07:59:15 +02:00
3543ffe9e1 update deps 2024-06-27 07:58:30 +02:00
1d6770f11b Merge pull request 'minor visual improvements' () from restructure-user into staging
Reviewed-on: 
2024-06-24 19:57:08 +02:00
1ad6509568 minor visual improvements 2024-06-24 19:56:35 +02:00
705f2ddc52 Merge pull request 'restructure-user' () from restructure-user into staging
Reviewed-on: 
2024-06-24 17:46:13 +02:00
Marie Birner
dba1e08c5d [TASK] quick restructure of user screen 2024-06-24 16:58:19 +02:00
1dc0c9c0e1 Merge pull request 'update iban' () from update-iban into main
Reviewed-on: 
2024-06-24 15:03:54 +02:00
45004567ed Merge pull request 'update-iban' () from update-iban into staging
Reviewed-on: 
2024-06-24 15:03:47 +02:00
3dff956544 update iban 2024-06-24 15:02:55 +02:00
79f8efc34b Merge pull request 'allow vorstand to send mail + notifications' () from allow-vorstand-to-send-things into main
Reviewed-on: 
2024-06-21 11:25:27 +02:00
5c31fac230 Merge pull request 'allow vorstand to send mail + notifications' () from allow-vorstand-to-send-things into staging
Reviewed-on: 
2024-06-21 11:25:09 +02:00
3e983e05f9 allow vorstand to send mail + notifications 2024-06-21 11:24:14 +02:00
8f91cc4e88 Merge pull request 'allow vorstand to send mail + notifications' () from allow-vorstand-to-send-things into main
Reviewed-on: 
2024-06-21 11:15:37 +02:00
c55f9743aa Merge pull request 'allow-vorstand-to-send-things' () from allow-vorstand-to-send-things into staging
Reviewed-on: 
2024-06-21 11:15:30 +02:00
76290a64ae allow vorstand to send mail + notifications 2024-06-21 11:14:48 +02:00
4b48fbaa82 Merge pull request 'update deps' () from update-deps into main
Reviewed-on: 
2024-06-19 13:44:08 +02:00
d25cd491d0 Merge pull request 'update deps' () from update-deps into staging
Reviewed-on: 
2024-06-19 13:44:07 +02:00
def8affb5f update deps 2024-06-19 13:43:04 +02:00
dfa7be9928 Merge pull request 'fix migration' () from fix-migration into main
Reviewed-on: 
2024-06-16 20:15:58 +02:00
03a467270d Merge pull request 'fix migration' () from fix-migration into staging
Reviewed-on: 
2024-06-16 20:15:54 +02:00
2159696112 fix migration test 2024-06-16 20:00:44 +02:00
1c04462c30 Merge pull request 'add more life to the mails :-)' () from more-sympatic-welcome-mail into main
Reviewed-on: 
2024-06-15 18:28:24 +02:00
7af53203f8 Merge pull request 'more-sympatic-welcome-mail' () from more-sympatic-welcome-mail into staging
Reviewed-on: 
2024-06-15 18:28:09 +02:00
b2393eb6ec mb is too serious 2024-06-15 18:27:09 +02:00
a5e82851ba fix missing word 2024-06-10 22:23:26 +02:00
80725e223b add more life to the mails :-) 2024-06-10 22:17:41 +02:00
39bde35864 Merge pull request 'add wifi pw in welcome mail' () from add-wifi-pw-new-members into main
Reviewed-on: 
2024-06-10 22:08:18 +02:00
70be6726db Merge pull request 'add-wifi-pw-new-members' () from add-wifi-pw-new-members into staging
Reviewed-on: 
2024-06-10 22:08:10 +02:00
5f301324ee add wifi pw in welcome mail 2024-06-10 22:07:14 +02:00
9558965e8f Merge pull request 'require necessary fields' () from require-necessary-fields into main
Reviewed-on: 
2024-06-10 20:59:43 +02:00
08fc324cc6 Merge pull request 'require-necessary-fields' () from require-necessary-fields into staging
Reviewed-on: 
2024-06-10 20:59:38 +02:00
5f4d8982a8 require necessary fields 2024-06-10 20:58:42 +02:00
0e2ef9e256 Merge pull request 'add trailer reservation funcitonality; Fixes ' () from trailer-reservation into main
Reviewed-on: 
2024-06-10 20:00:25 +02:00
df007524ed Merge pull request 'merged :-)' () from trailer-reservation into staging
Reviewed-on: 
2024-06-10 20:00:07 +02:00
1dc91f4f28 merged :-) 2024-06-10 19:59:39 +02:00
5720767af3 Merge pull request 'add trailer reservation funcitonality; Fixes ' () from trailer-reservation into staging
Reviewed-on: 
2024-06-10 19:58:13 +02:00
f56da43723 fix copied stuff 2024-06-10 19:48:16 +02:00
9dc1ec6fa0 add trailer reservation funcitonality; Fixes 2024-06-10 19:43:59 +02:00
c9b67f5790 Merge pull request 'add delete trip button in edit window; Fixes ' () from delte-trip-btn into main
Reviewed-on: 
2024-06-10 19:08:22 +02:00
1215bdbd84 Merge pull request 'delte-trip-btn' () from delte-trip-btn into staging
Reviewed-on: 
2024-06-10 19:08:17 +02:00
16687e39ab remove unused attribute 2024-06-10 19:07:55 +02:00
957c474389 add delete trip button in edit window; Fixes 2024-06-10 19:07:05 +02:00
f7aed68423 Merge pull request 'show if a user has < 30 km to thousand km trip, Fixes ' () from thousand-km-trips into main
Reviewed-on: 
2024-06-10 15:50:31 +02:00
01637d0800 Merge pull request 'use proper hydro license; add fluctuation' () from proper-hydro into main
Reviewed-on: 
2024-06-10 15:49:51 +02:00
734490efe7 Merge pull request 'use proper hydro license; add fluctuation' () from proper-hydro into staging
Reviewed-on: 
2024-06-10 15:49:43 +02:00