Commit Graph

1791 Commits

Author SHA1 Message Date
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
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
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
8db9e020c8 Merge pull request 'hide old verified boat damages' (#371) from hide-old-verified-boatdamages into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m11s
CI/CD Pipeline / deploy-staging (push) Successful in 5m39s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #371
2024-04-14 20:28:42 +02:00
42277699a7 hide old verified boat damages
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-14 20:28:06 +02:00
a1b78db750 Merge pull request 'don't show external boats in boatstat; hide logout in menu; move owner into own column in boatstat' (#368) from updates 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: #368
2024-04-14 20:22:18 +02:00
7ebbf5661a don't show external boats in boatstat; hide logout in menu; move owner into own column in boatstat
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-14 20:20:22 +02:00
2ff08141ae Merge pull request 'steering' (#367) from steering into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m13s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m36s
Reviewed-on: #367
2024-04-14 20:18:45 +02:00
297e0629a4 Merge pull request 'steering' (#366) from steering into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m0s
CI/CD Pipeline / deploy-staging (push) Successful in 5m35s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #366
2024-04-14 19:57:26 +02:00
213a80bd28 Merge branch 'staging' into steering
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-14 19:56:58 +02:00
b111c4a1b9 lint html
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m2s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-14 18:38:41 +02:00
Marie Birner
db43ef628f [TASK] style steering html
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-14 18:36:27 +02:00
ccf9f41f4e Merge branch 'staging' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m18s
CI/CD Pipeline / deploy-staging (push) Successful in 5m33s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-14 18:27:35 +02:00
fb9e694919 add required role 2024-04-14 18:27:21 +02:00
ea70170d2b Merge pull request '[TASK] improve style searchable table' (#365) from js-table into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m3s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m36s
Reviewed-on: #365
2024-04-14 18:19:22 +02:00
36af52bf7e Merge pull request 'js-table' (#364) from js-table into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m21s
CI/CD Pipeline / deploy-staging (push) Successful in 5m35s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #364
2024-04-14 17:56:43 +02:00
Marie Birner
0b6461eeb5 [TASK] improve style searchable table
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m4s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-14 17:43:18 +02:00
b0c936cc34 Merge pull request 'have test users only @ staging' (#363) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m6s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m34s
Reviewed-on: #363
2024-04-14 17:00:53 +02:00
d51174e8fd have test users only @ staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m26s
CI/CD Pipeline / deploy-staging (push) Successful in 5m34s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-14 16:59:17 +02:00
e2a30dad52 Merge pull request 'staging' (#360) from staging into main
Reviewed-on: #360
2024-04-13 09:52:24 +02:00
74d3957cf8 dont show external boat
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m9s
CI/CD Pipeline / deploy-staging (push) Successful in 5m35s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-13 09:44:22 +02:00
cfc35fbec6 only show non-placed boats in boathouse list
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-13 09:42:12 +02:00
b1d3f8ddc9 Merge pull request 'allow html in notifications' (#359) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m34s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m25s
Reviewed-on: #359
2024-04-12 11:33:26 +02:00
3b04b39d66 allow html in notifications
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m37s
CI/CD Pipeline / deploy-staging (push) Successful in 5m31s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-12 11:32:21 +02:00
cdcb07a3f7 Merge pull request 'update deps' (#356) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m27s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m26s
Reviewed-on: #356
2024-04-09 11:25:01 +02:00
19523acc67 update deps
All checks were successful
CI/CD Pipeline / test (push) Successful in 26m44s
CI/CD Pipeline / deploy-staging (push) Successful in 19m55s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-09 11:24:38 +02:00
faa8e6a13b Merge pull request 'fix ci' (#355) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m21s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m1s
Reviewed-on: #355
2024-04-09 08:08:11 +02:00
0fed206df6 fix ci
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m48s
CI/CD Pipeline / deploy-staging (push) Successful in 5m6s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-09 08:07:56 +02:00
7660953e6b Merge pull request 'don't clutter logs' (#354) from staging into main
Some checks failed
CI/CD Pipeline / test (push) Failing after 4m0s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #354
2024-04-09 07:30:40 +02:00
4a5d9fa65b don't clutter logs
Some checks failed
CI/CD Pipeline / test (push) Failing after 4m3s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-09 07:30:05 +02:00
83c0285204 Merge pull request 'staging' (#353) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m32s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m4s
Reviewed-on: #353
2024-04-08 23:22:24 +02:00