Commit Graph

2292 Commits

Author SHA1 Message Date
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
3823d959e8 add stats from nginx logs
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m48s
CI/CD Pipeline / deploy-staging (push) Successful in 7m53s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-08 23:21:35 +02:00
6c302712d4 add stats from nginx logs
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-08 23:20:33 +02:00
f93677b420 add stats from nginx logs 2024-04-08 23:19:59 +02:00
23cd62820c Merge pull request 'only show notifications from last 2 weeks' (#352) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m37s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m19s
Reviewed-on: #352
2024-04-08 20:25:37 +02:00
39d410b050 only show notifications from last 2 weeks
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m35s
CI/CD Pipeline / deploy-staging (push) Successful in 5m38s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-08 20:25:13 +02:00
61c67d78da Merge pull request 'allow admin to send notifications' (#351) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m31s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m36s
Reviewed-on: #351
2024-04-08 19:36:35 +02:00
64d32e2688 allow admin to send notifications
Some checks failed
CI/CD Pipeline / deploy-main (push) Waiting to run
CI/CD Pipeline / test (push) Successful in 11m20s
CI/CD Pipeline / deploy-staging (push) Has been cancelled
2024-04-08 19:35:31 +02:00
1aba6948ee Merge pull request 'only allow people with 'donau linz' role to be in logbook' (#350) from staging into main
Some checks failed
CI/CD Pipeline / test (push) Successful in 11m27s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been cancelled
Reviewed-on: #350
2024-04-08 19:05:29 +02:00
3b9103e9aa fix membership application error
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m50s
CI/CD Pipeline / deploy-staging (push) Successful in 6m55s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-08 19:04:57 +02:00
db3158d4e7 only allow people with 'donau linz' role to be in logbook
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m24s
CI/CD Pipeline / deploy-staging (push) Successful in 5m24s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-07 23:17:06 +02:00
08a970853a Merge pull request 'better text for boat reservation' (#349) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m23s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m1s
Reviewed-on: #349
2024-04-07 22:13:32 +02:00
7cbfafa5c5 better text for boat reservation
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m45s
CI/CD Pipeline / deploy-staging (push) Successful in 6m36s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-07 22:12:56 +02:00
c64f392fe7 Merge pull request 'improve header of list' (#348) 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 5m2s
Reviewed-on: #348
2024-04-07 20:12:22 +02:00
4fef4ca2c6 improve header of list
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m21s
CI/CD Pipeline / deploy-staging (push) Successful in 5m3s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-07 20:11:41 +02:00
268c2018ae Merge pull request 'allow to search by nickname' (#347) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m23s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 4m59s
Reviewed-on: #347
2024-04-07 15:31:07 +02:00
b7e8e1fa37 keep defaults
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m40s
CI/CD Pipeline / deploy-staging (push) Successful in 5m3s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-07 15:30:52 +02:00
fe6af27813 allow to search by nickname
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-07 15:26:37 +02:00
a2005c55aa Merge pull request 'show boats w/o km' (#346) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m28s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m40s
Reviewed-on: #346
2024-04-06 21:17:43 +02:00
da446c5073 show boats w/o km
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m23s
CI/CD Pipeline / deploy-staging (push) Successful in 5m47s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-06 21:17:23 +02:00
d3bc2bea4f Merge pull request 'staging' (#345) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m25s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m38s
Reviewed-on: #345
2024-04-06 20:00:25 +02:00
37fcdb81bc remove unnecessary if
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m32s
CI/CD Pipeline / deploy-staging (push) Successful in 6m48s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-06 19:57:42 +02:00
b3041d9ca7 also show boats w/o any 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-04-06 19:56:06 +02:00
7c8f20623c Merge pull request 'show owner of boat in boat km list' (#344) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m24s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m34s
Reviewed-on: #344
2024-04-06 18:57:57 +02:00
8b07ace876 show owner of boat in boat km list
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m18s
CI/CD Pipeline / deploy-staging (push) Successful in 5m32s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-06 18:55:38 +02:00
073b2aca04 Merge pull request 'don't show external cox as cox' (#343) 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 5m25s
Reviewed-on: #343
2024-04-06 18:40:29 +02:00
934795abd8 don't show external cox as cox
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-06 18:40:01 +02:00
c3965c9528 Merge pull request 'staging' (#342) 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: #342
2024-04-06 18:29:27 +02:00
5164ce1f02 show list of coxes
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-06 18:27:20 +02:00
18cdb20923 Merge pull request 'fancier-boat-stats' (#341) from fancier-boat-stats into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m33s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m25s
Reviewed-on: #341
2024-04-06 17:56:07 +02:00
85a61dfdc0 Merge pull request 'fancier-boat-stats' (#340) from fancier-boat-stats into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m33s
CI/CD Pipeline / deploy-staging (push) Successful in 5m36s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #340
2024-04-06 17:54:42 +02:00
c094097af7 don't show boats which are still on the water
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-06 17:54:07 +02:00
39ba7d53dd make table readable
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-06 17:44:05 +02:00
98fc037f73 Merge pull request 'fancier boat stats' (#339) from fancier-boat-stats into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m19s
CI/CD Pipeline / deploy-staging (push) Successful in 5m23s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #339
2024-04-06 15:28:28 +02:00
955f657298 fancier boat stats
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m48s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-06 15:27:35 +02:00
853f9d901e Merge pull request 'staging' (#338) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m39s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m22s
Reviewed-on: #338
2024-04-03 18:07:59 +02:00
d0c2b4d703 don't show duplicate boats for rennrowing
All checks were successful
CI/CD Pipeline / test (push) Successful in 17m45s
CI/CD Pipeline / deploy-staging (push) Successful in 12m1s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-03 18:07:20 +02:00
1af3838ebc use proper timezone
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m3s
CI/CD Pipeline / deploy-staging (push) Successful in 4m53s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-03 08:13:32 +02:00
d0bbf8f181 Merge pull request 'staging' (#337) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m56s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m6s
Reviewed-on: #337
2024-04-03 08:07:48 +02:00
8c8a5c9762 show boats which have place in boatshouse
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-03 08:07:16 +02:00
b0ea0668c7 Merge pull request 'reservations' (#327) from reservations into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m0s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 6m5s
Reviewed-on: #327
2024-04-02 21:46:18 +02:00
4e1de0c886 Merge pull request 'show 'no reservations' if no reservations :-)' (#336) from reservations into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m57s
CI/CD Pipeline / deploy-staging (push) Successful in 5m39s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #336
2024-04-02 21:31:53 +02:00
244eb1be07 show 'no reservations' if no reservations :-)
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-02 21:31:02 +02:00
06f9fcc427 Merge pull request 'reservations' (#335) from reservations into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m15s
CI/CD Pipeline / deploy-staging (push) Successful in 5m27s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #335
2024-04-02 21:12:14 +02:00
784deaf9f4 deployed :-)
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-02 21:11:31 +02:00
3b63cafa79 Merge branch 'staging' into reservations 2024-04-02 21:09:47 +02:00
0fe672c9da 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-02 21:08:35 +02:00
37ab6e9132 reorder ergo entry 2024-04-02 21:07:58 +02:00
53afb4ee6f [TASK] style boat reservation
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 11m15s
2024-04-02 20:59:09 +02:00
1783527f39 Merge branch 'main' into reservations
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m52s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-02 11:19:51 +02:00