Commit Graph

2419 Commits

Author SHA1 Message Date
4bec5443a2 Merge pull request 'dont-show-steer-btn-when-no-coxes' (#396) from dont-show-steer-btn-when-no-coxes into staging
Some checks are pending
CI/CD Pipeline / test (push) Waiting to run
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Reviewed-on: #396
2024-04-17 13:58:11 +02:00
ee7c62c3b7 Merge pull request 'don't show steer button when there are no coxes planned for this event; Fixes #357' (#397) from dont-show-steer-btn-when-no-coxes into main
Some checks are pending
CI/CD Pipeline / test (push) Waiting to run
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Reviewed-on: #397
2024-04-17 13:57:53 +02:00
42a3addd9a make it more clear which action is required if notifications are present
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-04-17 13:57:24 +02:00
7c71ce59bd show notification badge in menu
Some checks are pending
CI/CD Pipeline / test (push) Waiting to run
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
2024-04-17 13:51:47 +02:00
858ae28eb3 allow deletion of boat
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m16s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-17 13:18:35 +02:00
55b259061b don't show steer button when there are no coxes planned for this event; Fixes #357
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m43s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-17 13:04:03 +02:00
e2746d5105 Merge pull request 'send creator of boatdamage notification when it has been repaired' (#395) from boatdamage-notification-to-creator into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m47s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m25s
Reviewed-on: #395
2024-04-17 13:02:53 +02:00
1dd752f354 Merge pull request 'boatdamage-notification-to-creator' (#394) from boatdamage-notification-to-creator into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m46s
CI/CD Pipeline / deploy-staging (push) Successful in 5m29s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #394
2024-04-17 13:02:49 +02:00
22d499d38b send creator of boatdamage notification when it has been repaired
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2024-04-17 12:44:31 +02:00
d0830e4631 Merge pull request 'don't clutter logs' (#393) from fix-logs into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m42s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m23s
Reviewed-on: #393
2024-04-17 12:22:59 +02:00
ef85d30846 Merge pull request 'fix-logs' (#392) from fix-logs into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m47s
CI/CD Pipeline / deploy-staging (push) Successful in 5m28s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #392
2024-04-17 12:22:32 +02:00
36d7c43bbd don't clutter logs
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2024-04-17 12:21:57 +02:00
3ff8067c51 Merge pull request '[TASK] change favicon to make it sharper' (#391) from favicon into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m42s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m28s
Reviewed-on: #391
2024-04-17 11:41:59 +02:00
4d3af37d5f Merge pull request 'favicon' (#390) from favicon into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m1s
CI/CD Pipeline / deploy-staging (push) Successful in 5m32s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #390
2024-04-17 11:41:26 +02:00
Marie Birner
0f96f39f24 [TASK] change favicon to make it sharper
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-04-17 11:35:12 +02:00
b32bdb5a70 Merge pull request 'styling-mail' (#389) from styling-mail into main
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #389
2024-04-17 11:34:07 +02:00
6956e4c487 Merge pull request 'styling-mail' (#388) from styling-mail into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m50s
CI/CD Pipeline / deploy-staging (push) Successful in 5m33s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #388
2024-04-17 11:10:45 +02:00
Marie Birner
acb1c711e5 [TASK] style notification
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m53s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-17 10:56:22 +02:00
Marie Birner
ec0bd91aa3 [TASK] styling mail
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-04-17 10:54:07 +02:00
de786c2b51 Merge pull request 'fix-spacing' (#387) from fix-spacing into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m49s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m31s
Reviewed-on: #387
2024-04-16 20:07:11 +02:00
558f600271 Merge pull request 'no space before '/'' (#386) from fix-spacing into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m5s
CI/CD Pipeline / deploy-staging (push) Successful in 5m33s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #386
2024-04-16 20:06:33 +02:00
5c680a8bea no space before '/'
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-04-16 20:05:55 +02:00
74f4d4854a Merge pull request 'dont clutter logs' (#385) from usage-stats into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m29s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m27s
Reviewed-on: #385
2024-04-16 10:00:45 +02:00
4b49b5517d Merge pull request 'dont clutter logs' (#384) from usage-stats into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m49s
CI/CD Pipeline / deploy-staging (push) Successful in 5m28s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #384
2024-04-16 10:00:05 +02:00
0cd623482c dont clutter logs
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m52s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-16 09:59:39 +02:00
0a01b95c85 Merge pull request 'fix ci' (#383) from usage-stats into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m3s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m30s
Reviewed-on: #383
2024-04-16 09:08:26 +02:00
6daf2495a8 Merge pull request 'fix ci' (#381) from usage-stats into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m10s
CI/CD Pipeline / deploy-staging (push) Successful in 5m39s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #381
2024-04-16 09:07:31 +02:00
8771a378da fix ci
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-04-16 09:06:24 +02:00
e84547c8ca Merge pull request 'log usage' (#380) from usage-stats into main
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #380
2024-04-16 08:54:25 +02:00
872dcd0668 Merge pull request 'log usage' (#379) from usage-stats into staging
Some checks failed
CI/CD Pipeline / test (push) Failing after 10m29s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #379
2024-04-16 08:53:46 +02:00
a9f74fcd3c log usage
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2024-04-16 08:52:37 +02:00
95752703ff Merge pull request 'clean w/ clippy' (#378) from clippy into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m11s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m32s
Reviewed-on: #378
2024-04-15 23:37:27 +02:00
5e19a62c7e Merge pull request 'clippy' (#377) from clippy into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m44s
CI/CD Pipeline / deploy-staging (push) Successful in 5m35s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #377
2024-04-15 23:37:18 +02:00
2694829b6e clean w/ clippy
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m52s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-15 23:26:52 +02:00
151e1b7864 Merge pull request 'show steering person in logs if not cox' (#376) from show-steering-person-in-logs into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m41s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m32s
Reviewed-on: #376
2024-04-15 22:04:14 +02:00
5965b1d626 Merge pull request 'show steering person in logs if not cox' (#375) from show-steering-person-in-logs into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m46s
CI/CD Pipeline / deploy-staging (push) Successful in 5m28s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #375
2024-04-15 22:03:39 +02:00
219b80377d show notification to vorstand if boat entry with 'externes boot' or on multiple days is entered
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2024-04-15 22:03:20 +02:00
8315a27ea8 fix tests (proper timezone), proper spacing
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m39s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-15 21:32:16 +02:00
d070c7731a show steering person in logs if not cox
Some checks failed
CI/CD Pipeline / test (push) Failing after 13m49s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-15 20:45:26 +02:00
c8f614e2d2 Merge pull request 'staging' (#374) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m46s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m29s
Reviewed-on: #374
2024-04-15 18:49:51 +02:00
4b07c11bc3 fix ci
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-04-15 18:24:18 +02:00
0bc00472d7 don't create any notification if we are working with planned_event
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-04-15 18:22:58 +02:00
37da4f2c3e Merge branch 'main' into staging
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-04-15 18:16:57 +02:00
74505c1554 add notification to all pot. coxes if trip is full 2024-04-15 18:16:43 +02:00
1869b36e09 add notification on canceled trips; add explicit 'cancel trip' button 2024-04-15 17:17:54 +02:00
13808d0103 Merge pull request 'staging' (#373) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m7s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m32s
Reviewed-on: #373
2024-04-15 11:26:20 +02:00
4a3803df51 Merge branch 'main' into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m8s
CI/CD Pipeline / deploy-staging (push) Successful in 5m30s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-15 11:25:49 +02:00
d58d4642af 1x boats: don't show 'Ruderer: ' in logbook; Fixes #362
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-04-15 11:23:07 +02:00
c3fa5195d3 Merge pull request 'hide old verified boat damages' (#372) from hide-old-verified-boatdamages into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m42s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m33s
Reviewed-on: #372
2024-04-14 21:40:39 +02:00
c4a9a541d3 Merge pull request 'don't show external boats in boatstat; hide logout in menu; move owner into own column in boatstat' (#369) from updates into main
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #369
2024-04-14 21:40:27 +02:00