Commit Graph

2140 Commits

Author SHA1 Message Date
f2874a4c1b Merge branch 'staging' into notification
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-03-21 20:49:56 +01:00
a27e9612e4 Merge pull request 'notification' (#292) from notification into main
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
Reviewed-on: #292
2024-03-21 20:48:20 +01:00
04b09983bc format with djlint
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-03-21 20:47:48 +01:00
Marie Birner
7050d68293 [TASK] style notifications, add rowing icon and refactor menu
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-03-21 20:42:49 +01:00
d1067988c6 update wording
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m24s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-21 19:38:47 +01:00
257a682eb4 Merge branch 'main' into notification
All checks were successful
CI/CD Pipeline / test (push) Successful in 22m8s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-21 00:27:11 +01:00
80cc614390 Merge pull request '...' (#300) from fix-ci into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m50s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 4m34s
Reviewed-on: #300
2024-03-21 00:26:54 +01:00
431accb20e Merge pull request 'fix-ci' (#299) from fix-ci into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m9s
CI/CD Pipeline / deploy-staging (push) Successful in 18m32s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #299
2024-03-21 00:26:35 +01:00
58db070cc0 ...
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-03-21 00:26:10 +01:00
31348a6a93 Merge branch 'main' into notification
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-03-21 00:18:18 +01:00
f50ea78e3f Merge pull request 'fix ci' (#298) from fix-ci 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: #298
2024-03-21 00:17:44 +01:00
8792dc7cbf Merge pull request 'fix-ci' (#297) from fix-ci 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
Reviewed-on: #297
2024-03-21 00:17:07 +01:00
59e5f48589 fix ci
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-03-21 00:16:29 +01:00
4624dfaf17 Merge branch 'main' into notification
Some checks failed
CI/CD Pipeline / test (push) Failing after 1m35s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-20 23:52:37 +01:00
5ddc302048 Merge pull request 'update deps' (#296) from update-deps into main
Some checks failed
CI/CD Pipeline / test (push) Failing after 9m15s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #296
2024-03-20 23:51:59 +01:00
2d4b433144 Merge pull request 'update-deps' (#295) from update-deps into staging
Some checks failed
CI/CD Pipeline / test (push) Failing after 9m35s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #295
2024-03-20 23:51:39 +01:00
0d8040c00e update deps
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-03-20 23:51:00 +01:00
b920d65f1a Merge pull request 'dont log pdf content' (#294) from dont-log-pdf-content 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: #294
2024-03-20 23:50:09 +01:00
9c277df2b7 Merge pull request 'dont log pdf content' (#293) from dont-log-pdf-content 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
Reviewed-on: #293
2024-03-20 23:49:21 +01:00
591f9ea245 dont log pdf content
Some checks failed
CI/CD Pipeline / test (push) Failing after 1m40s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-20 23:48:42 +01:00
bc35afb521 Merge pull request 'notification' (#291) from notification into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m32s
CI/CD Pipeline / deploy-staging (push) Successful in 4m25s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #291
2024-03-20 22:23:12 +01:00
6a6afe5e60 Merge branch 'staging' into notification
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m13s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-20 22:22:38 +01:00
63af74662f Merge branch 'main' into notification
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-03-20 22:21:12 +01:00
e3afe8c2ae Merge pull request 'push' (#290) from only-show-input-when-possible into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m6s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m7s
Reviewed-on: #290
2024-03-20 22:14:10 +01:00
c9270b2c54 Merge pull request 'only-show-input-when-possible' (#289) from only-show-input-when-possible 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
Reviewed-on: #289
2024-03-20 22:13:48 +01:00
ac90dbedea push
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-03-20 22:13:18 +01:00
0dcf941cd1 Merge pull request 'only accept pdf' (#288) from fix-ci into main
Some checks are pending
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) Successful in 9m12s
Reviewed-on: #288
2024-03-20 21:40:54 +01:00
39306150bb Merge pull request 'only accept pdf' (#287) from fix-ci into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m3s
CI/CD Pipeline / deploy-staging (push) Successful in 5m41s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #287
2024-03-20 21:40:33 +01:00
868847f778 only accept pdf
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m7s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-20 21:40:08 +01:00
638c13bc53 Merge pull request 'fix-ci' (#286) from fix-ci 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
Reviewed-on: #286
2024-03-20 21:27:44 +01:00
ffce336199 Merge pull request 'fix ci' (#285) from fix-ci into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m18s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 4m57s
Reviewed-on: #285
2024-03-20 21:17:54 +01:00
35900f3059 fix ci
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-03-20 21:16:55 +01:00
9a1117a7c8 Merge pull request 'membership-pdf-new' (#284) from membership-pdf-new into staging
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
Reviewed-on: #284
2024-03-20 21:05:22 +01:00
e48bc468cd Merge pull request 'add membership pdf' (#283) from membership-pdf-new into main
Some checks failed
CI/CD Pipeline / test (push) Failing after 7m23s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #283
2024-03-20 21:04:42 +01:00
9fdc1f82bd add membership pdf
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-03-20 21:02:41 +01:00
9d14dae4a7 notification (#282)
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m58s
CI/CD Pipeline / deploy-staging (push) Successful in 4m18s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #282
2024-03-20 16:19:12 +01:00
6959f71f96 show additional notification
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m48s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-20 16:09:55 +01:00
be50e65846 add notifications; fixes #127
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m48s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-20 15:56:34 +01:00
2ebfe7564a Merge branch 'staging' into notification
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m23s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-20 14:00:25 +01:00
fda2673f5a Merge pull request 'improve boathouse functionality, fixes #261' (#281) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m12s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 3m57s
Reviewed-on: #281
2024-03-20 13:59:30 +01:00
68a1153885 improve boathouse functionality, fixes #261
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m22s
CI/CD Pipeline / deploy-staging (push) Successful in 4m4s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-20 13:58:42 +01:00
7614cc8fae Merge pull request 're-wording' (#280) from staging into main
Some checks failed
CI/CD Pipeline / test (push) Successful in 8m5s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been cancelled
Reviewed-on: #280
2024-03-20 13:41:28 +01:00
c1411b3a76 re-wording
Some checks failed
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Successful in 8m8s
CI/CD Pipeline / deploy-staging (push) Has been cancelled
2024-03-20 13:41:14 +01:00
6ad07f35f7 Merge pull request 'show total club km' (#279) from staging 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: #279
2024-03-20 13:34:54 +01:00
5533106aca show total club km
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-03-20 13:34:21 +01:00
f61ffb60d8 Merge pull request 'don't count 'externe steuerkilometer' as guest kms' (#278) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 7m57s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 3m56s
Reviewed-on: #278
2024-03-20 09:16:21 +01:00
a17a08d018 create temporary boat reservation feature
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m13s
CI/CD Pipeline / deploy-staging (push) Successful in 4m4s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-20 09:15:58 +01:00
c9eecf0a29 create temporary boat reservation feature
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-03-20 09:14:26 +01:00
9c1bcbc5f5 don't count 'externe steuerkilometer' as guest kms
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m16s
CI/CD Pipeline / deploy-staging (push) Successful in 4m2s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-20 08:58:51 +01:00
d6b4f76fb5 Merge pull request 'fix ci' (#277) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m20s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 4m16s
Reviewed-on: #277
2024-03-20 00:48:47 +01:00