2506 Commits

Author SHA1 Message Date
47a543fa64 fix spacing 2024-05-26 14:17:26 +02:00
4e8fd84134 Merge pull request 'fix typo' () from type into main
Reviewed-on: 
2024-05-25 18:53:00 +02:00
410cd05acc Merge pull request 'type' () from type into staging
Reviewed-on: 
2024-05-25 18:52:45 +02:00
544267a037 fix typo 2024-05-25 18:52:00 +02:00
97b0ae83a9 Merge pull request 'extend log filter' () from filter-logs into main
Reviewed-on: 
2024-05-22 23:42:19 +02:00
972811c2cf Merge pull request 'filter-logs' () from filter-logs into staging
Reviewed-on: 
2024-05-22 23:42:06 +02:00
f6d8c07c08 extend log filter 2024-05-22 23:41:24 +02:00
da56723909 Merge pull request 'fix footer' () from fix-footer into main
Reviewed-on: 
2024-05-22 22:51:54 +02:00
e22d2d718e Merge pull request 'fix-footer' () from fix-footer into staging
Reviewed-on: 
2024-05-22 22:51:39 +02:00
603aed8394 fix footer 2024-05-22 22:51:10 +02:00
f22d3b65be Merge pull request 'only allow realistic values for logbook entries' () from sanity-check-timing into main
Reviewed-on: 
2024-05-22 22:41:35 +02:00
b55f122f1d Merge pull request 'sanity-check-timing; fixes ' () from sanity-check-timing into staging
Reviewed-on: 
2024-05-22 22:41:31 +02:00
446e48020e test fails due to new sanity check (25km in 1 min :-)); started trip 2 hours ago now in tests 2024-05-22 22:28:33 +02:00
93e3e0ef5c only allow realistic values for logbook entries 2024-05-22 22:05:03 +02:00
8f5cc70981 Merge pull request 'automate schnupper mails' () from automate-schnupper-mails into main
Reviewed-on: 
2024-05-22 08:51:41 +02:00
d27489d714 Merge pull request 'automate-schnupper-mails' () from automate-schnupper-mails into staging
Reviewed-on: 
2024-05-22 08:51:39 +02:00
71c228f202 automate schnupper mails 2024-05-22 08:30:38 +02:00
3ebde6afce Merge pull request 'allow to add reason for canceled event; fixes ' () from reason-for-canceled-event into main
Reviewed-on: 
2024-05-22 08:13:58 +02:00
c340d1a916 Merge pull request 'reason-for-canceled-event' () from reason-for-canceled-event into staging
Reviewed-on: 
2024-05-22 08:13:55 +02:00
a797180b0d allow to add reason for canceled event; fixes 2024-05-22 08:04:17 +02:00
9704893329 Merge pull request 'fix ci' () from fix-ci into main
Reviewed-on: 
2024-05-22 00:24:46 +02:00
e7732b9e96 Merge pull request 'fix-ci' () from fix-ci into staging
Reviewed-on: 
2024-05-22 00:24:22 +02:00
05c4c4f6a2 fix ci 2024-05-22 00:23:51 +02:00
daf9460bf7 Merge pull request 'clean code with clippy' () from clippy into main
Reviewed-on: 
2024-05-22 00:18:47 +02:00
97dc9308bc Merge pull request 'clippy' () from clippy into staging
Reviewed-on: 
2024-05-22 00:18:35 +02:00
db5e0873a6 Merge branch 'staging' into clippy 2024-05-22 00:18:17 +02:00
40f97f18a9 clean code with clippy 2024-05-22 00:13:23 +02:00
6b911f242a Merge pull request 'fix html duplicate tags' () from fix-html into main
Reviewed-on: 
2024-05-21 23:46:17 +02:00
f4ce748a74 Merge pull request 'fix html duplicate tags' () from fix-html into staging
Reviewed-on: 
2024-05-21 23:46:14 +02:00
d4ffd8850e fix html duplicate tags 2024-05-21 23:35:36 +02:00
c93556a5ab Merge pull request 'allow cancel of events' () from allow-cancel-of-events into staging
Reviewed-on: 
2024-05-21 22:39:56 +02:00
96ce46d39c Merge branch 'main' into allow-cancel-of-events 2024-05-21 22:19:33 +02:00
412ec27927 Merge pull request 'remove notificatoin about canceled trip if cancelation has been canceled' () from remove-notification into main
Reviewed-on: 
2024-05-21 22:18:11 +02:00
a1c7e4c690 Merge pull request 'remove-notification' () from remove-notification into staging
Reviewed-on: 
2024-05-21 22:17:56 +02:00
1f0de7abf4 allow cancel of events 2024-05-21 22:16:42 +02:00
64f3596132 remove notificatoin about canceled trip if cancelation has been canceled 2024-05-21 20:43:05 +02:00
3b75f38dca Merge pull request 'remove users from trip after they have read the notificatoin' () from remove-users-from-canceled-trips-after-reading-notification into main
Reviewed-on: 
2024-05-21 20:01:25 +02:00
10f2e3016a Merge pull request 'Merge pull request 'allow for sending notifications to single users' () from allow-notifications-for-single-user into main' () from remove-users-from-canceled-trips-after-reading-notification into staging
Reviewed-on: 
2024-05-21 20:01:17 +02:00
1069e29cf0 fix ci 2024-05-21 19:47:10 +02:00
b4967b54e9 remove users from trip after they have read the notificatoin 2024-05-21 19:41:00 +02:00
1285c3bc28 Merge pull request 'allow for sending notifications to single users' () from allow-notifications-for-single-user into main
Reviewed-on: 
2024-05-21 19:27:41 +02:00
b6c9cb0b99 Merge pull request 'allow-notifications-for-single-user' () from allow-notifications-for-single-user into staging
Reviewed-on: 
2024-05-21 19:27:36 +02:00
29fabb04b0 allow for sending notifications to single users 2024-05-21 18:57:24 +02:00
830aa58e7b Merge pull request 'don't allow to delete an event if someone is registered' () from deletion-event-only-ok-noone-registered into main
Reviewed-on: 
2024-05-21 18:44:54 +02:00
1b6aec8d89 Merge pull request 'deletion-event-only-ok-noone-registered' () from deletion-event-only-ok-noone-registered into staging
Reviewed-on: 
2024-05-21 18:44:47 +02:00
1bf1cc9c68 inform user in case event can't be deleted 2024-05-21 18:34:17 +02:00
02e1f77f65 don't allow to delete an event if someone is registered 2024-05-21 18:28:56 +02:00
d819462b0d Merge pull request 'log if admin resets the pw for someone' () from log-pw-reset into main
Reviewed-on: 
2024-05-21 09:06:46 +02:00
387acdbd09 Merge pull request 'log if admin resets the pw for someone' () from log-pw-reset into staging
Reviewed-on: 
2024-05-21 09:06:37 +02:00
b36144832a log if admin resets the pw for someone 2024-05-21 09:05:36 +02:00