Commit Graph

2038 Commits

Author SHA1 Message Date
6fb27d52d6 Merge branch 'main' into reservations
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) Has been skipped
2024-04-01 22:39:26 +02:00
092dba3f4b Merge pull request 'only-last-30-days-notifications' (#331) from only-last-30-days-notifications into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m17s
CI/CD Pipeline / deploy-staging (push) Successful in 5m13s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #331
2024-04-01 22:38:37 +02:00
6044aed46f Merge pull request 'only-last-30-days-notifications' (#332) from only-last-30-days-notifications into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m22s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 6m22s
Reviewed-on: #332
2024-03-31 13:09:21 +02:00
ef4e6f57d9 only show read notifications for last 30 days
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m36s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-31 13:07:40 +02:00
974b4aeb48 Merge branch 'main' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt 2024-03-31 13:07:06 +02:00
4466c9f018 Merge pull request 'hide reservations if there are none; clean code' (#330) from reservations into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m12s
CI/CD Pipeline / deploy-staging (push) Successful in 6m16s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #330
2024-03-30 09:17:59 +01:00
0ba2590bfd hide reservations if there are none; clean code
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m6s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-30 09:17:32 +01:00
cccf62bb53 Merge pull request 'reservations' (#326) from reservations into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m8s
CI/CD Pipeline / deploy-staging (push) Successful in 5m7s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #326
2024-03-30 01:50:54 +01:00
649169c192 reservations
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m11s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-30 01:36:37 +01:00
1caced26d6 Merge pull request 'proper log for registering guests' (#325) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m14s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m13s
Reviewed-on: #325
2024-03-29 21:46:58 +01:00
163c97b2f5 proper log for registering guests
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-29 21:46:15 +01:00
7a28f0360d Merge pull request 'allow planned_event role to add guests' (#324) 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: #324
2024-03-29 21:29:38 +01:00
a5ed2cb9e3 allow planned_event role to add guests
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 10m29s
2024-03-29 21:29:06 +01:00
35333324ed Merge pull request 'staging' (#323) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m4s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m18s
Reviewed-on: #323
2024-03-29 11:26:16 +01:00
2d36be07d2 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 10m10s
CI/CD Pipeline / deploy-staging (push) Successful in 7m24s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-29 11:25:34 +01:00
183f26e5c3 update boat reservation... 2024-03-29 11:25:25 +01:00
2452d31b9a Merge pull request '[BUGFIX] mobile menu fix styling' (#320) from bugfix-mobile-menu into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m0s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 4m47s
Reviewed-on: #320
2024-03-28 09:08:51 +01:00
4549043a08 Merge pull request 'bugfix-mobile-menu' (#319) from bugfix-mobile-menu into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m2s
CI/CD Pipeline / deploy-staging (push) Successful in 4m52s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #319
2024-03-28 09:08:36 +01:00
Marie Birner
47986df47e [BUGFIX] mobile menu fix styling
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-28 09:05:32 +01:00
42a1579cd1 Merge pull request 'show new notifications for boatdamages; Fixes #310' (#318) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m35s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m4s
Reviewed-on: #318
2024-03-28 08:34:29 +01:00
a36fc300f0 show new notifications for boatdamages; Fixes #310
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m55s
CI/CD Pipeline / deploy-staging (push) Successful in 5m59s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-28 08:34:02 +01:00
c5af1e4cf8 Merge pull request 'show new notifications @ top' (#317) from staging into main
Some checks failed
CI/CD Pipeline / test (push) Successful in 9m59s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been cancelled
Reviewed-on: #317
2024-03-28 08:11:37 +01:00
ab565f1369 show new notifications @ top
Some checks failed
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Successful in 10m0s
CI/CD Pipeline / deploy-staging (push) Has been cancelled
2024-03-28 08:10:26 +01:00
3e859ebc7b Merge pull request 'update deps' (#316) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m36s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 4m50s
Reviewed-on: #316
2024-03-27 14:55:25 +01:00
2b05828f6f update deps
All checks were successful
CI/CD Pipeline / test (push) Successful in 19m11s
CI/CD Pipeline / deploy-staging (push) Successful in 14m47s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-27 14:53:54 +01:00
df72ec9d8a Merge pull request 'only use membership_pdf when necessary' (#314) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m7s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 4m17s
Reviewed-on: #314
2024-03-26 12:35:19 +01:00
bf04ff780f only use membership_pdf when necessary
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m11s
CI/CD Pipeline / deploy-staging (push) Successful in 4m22s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-26 12:34:19 +01:00
64ca6caa3c Merge pull request 'add /planned to quick menu' (#313) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m44s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 4m49s
Reviewed-on: #313
2024-03-24 14:03:23 +01:00
9b70875c72 add /planned to quick menu
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m30s
CI/CD Pipeline / deploy-staging (push) Successful in 8m20s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-24 14:02:22 +01:00
5d55a10ad0 Merge pull request 'better wording for notification' (#312) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m23s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 4m33s
Reviewed-on: #312
2024-03-22 21:04:23 +01:00
272b6f3eb1 better wording for notification
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m27s
CI/CD Pipeline / deploy-staging (push) Successful in 4m34s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-22 21:03:43 +01:00
890f6cce3f Merge pull request 'staging' (#311) 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: #311
2024-03-22 20:50:29 +01:00
67eea1beb0 remove 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 9m50s
2024-03-22 20:49:56 +01:00
abefd93be5 add db pic, created with sqleton 2024-03-22 20:48:04 +01:00
1e0096c44b Merge pull request '[BUGFIX] close div index html' (#307) from bugfix into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m31s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 4m31s
Reviewed-on: #307
2024-03-21 22:20:58 +01:00
c007ae6fb8 Merge pull request 'bugfix' (#306) from bugfix into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m41s
CI/CD Pipeline / deploy-staging (push) Successful in 4m38s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #306
2024-03-21 22:20:50 +01:00
Marie Birner
b9f11281e5 [BUGFIX] close div index html
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m30s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-21 21:58:27 +01:00
2e4a9a1168 Merge pull request 'merger :-)' (#305) from remove-merged-staging-diff into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m25s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 6m48s
Reviewed-on: #305
2024-03-21 21:04:30 +01:00
53ca2c24c1 Merge pull request 'merger :-)' (#304) from remove-merged-staging-diff into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m29s
CI/CD Pipeline / deploy-staging (push) Successful in 6m31s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #304
2024-03-21 21:04:14 +01:00
42e032e977 Merge pull request 'fix-ci' (#303) from fix-ci 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: #303
2024-03-21 21:03:55 +01:00
ac587a1b1c Merge pull request 'fix ci' (#302) from fix-ci 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: #302
2024-03-21 21:03:35 +01:00
905a22e7c0 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-03-21 21:02:52 +01:00
15e3680a97 merger :-)
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 20:55:47 +01:00
9eb91ee2d4 Merge pull request 'notification' (#301) from notification into staging
Some checks failed
CI/CD Pipeline / test (push) Failing after 7m55s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #301
2024-03-21 20:51:41 +01:00
266a3b978e Merge branch 'notification' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into notification
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 20:50:31 +01:00
de1b6b76c9 format with djlint 2024-03-21 20:50:25 +01:00
Marie Birner
961cdbad09 [TASK] style notifications, add rowing icon and refactor menu 2024-03-21 20:50:25 +01:00
3416373b8f update wording 2024-03-21 20:50:25 +01:00
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