Commit Graph

1860 Commits

Author SHA1 Message Date
Marie Birner
be24001b4b Merge branch 'allow-reservation-edits' 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
# Conflicts:
#	src/tera/boatreservation.rs
2024-04-23 23:04:46 +02:00
Marie Birner
d9885f9bba [TASK] change padding form
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-23 22:58:48 +02:00
61261c9816 allow edits of boatreservations, Fixes #417
All checks were successful
CI/CD Pipeline / test (push) Successful in 21m39s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-23 22:23:24 +02:00
f1ee266288 Merge pull request 'add script to fetch current db' (#421) from fetch-db-script into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m53s
CI/CD Pipeline / deploy-staging (push) Successful in 6m56s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #421
2024-04-23 21:12:14 +02:00
548c025fbc Merge pull request '[TASK] group reservations in log to avoid near-duplicates' (#419) from group-reservations-in-log 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: #419
2024-04-23 21:11:18 +02:00
8f44fdadf2 add script to fetch current db
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-23 21:10:04 +02:00
3abff08f61 [TASK] group reservations in log to avoid near-duplicates
All checks were successful
CI/CD Pipeline / test (push) Successful in 21m22s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-23 20:40:06 +02:00
3c67e0deeb Merge pull request 'allow to upload membership pdf for users which don't have it' (#415) from allow-membership-uploads into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m35s
CI/CD Pipeline / deploy-staging (push) Successful in 7m26s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #415
2024-04-22 10:37:09 +02:00
ef21e719c8 allow to upload membership pdf for users which don't have it
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-22 10:36:47 +02:00
27b124cce5 Merge pull request 'update deps' (#413) from update-deps into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 29m46s
CI/CD Pipeline / deploy-staging (push) Successful in 23m47s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #413
2024-04-19 16:38:23 +02:00
254e8b7063 update deps
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-19 16:36:42 +02:00
c122dea6a9 Merge pull request 'notification-badge' (#409) from notification-badge into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 21m20s
CI/CD Pipeline / deploy-staging (push) Successful in 18m13s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #409
2024-04-19 15:54:58 +02:00
2ad5f0883c make clicking on 'create trip' button more robust (clicked on notification as this was the first .relative element
All checks were successful
CI/CD Pipeline / test (push) Successful in 21m15s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-19 15:33:44 +02:00
8f2d1ef6f4 wait until dev server started for frontend tests
Some checks failed
CI/CD Pipeline / test (push) Failing after 23m51s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-19 15:04:03 +02:00
d6214d5369 fix comma issue
Some checks failed
CI/CD Pipeline / test (push) Failing after 23m58s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-19 13:17:22 +02:00
74ededf913 fix ci
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-19 13:09:17 +02:00
8ffed75251 don't show warning about many notifications if they are already read
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-19 13:00:39 +02:00
Marie Birner
73a6f1d58c Merge branch 'notification-badge' of https://git.hofer.link/Ruderverein-Donau-Linz/rowt into notification-badge
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-19 12:54:47 +02:00
Marie Birner
2540e49a31 [TASK] improve styling text warning notifications 2024-04-19 12:54:32 +02:00
d612cf01b6 Merge pull request 'main' (#412) from main into notification-badge
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: #412
2024-04-19 12:53:22 +02:00
44c1b1bb72 Merge pull request 'use new docker image' (#411) from new-docker-image into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 21m13s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 18m3s
Reviewed-on: #411
2024-04-19 12:51:48 +02:00
e3895f3c9c Merge pull request 'use new docker image' (#410) from new-docker-image into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 21m33s
CI/CD Pipeline / deploy-staging (push) Successful in 18m18s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #410
2024-04-19 12:51:12 +02:00
Marie Birner
e00142926e Merge branch 'notification-badge' of https://git.hofer.link/Ruderverein-Donau-Linz/rowt into notification-badge 2024-04-19 12:48:33 +02:00
Marie Birner
4c6ef71a17 [TASK] improve btn sidebar unregister guest 2024-04-19 12:48:23 +02:00
7b32b9bbcb use new docker image
All checks were successful
CI/CD Pipeline / test (push) Successful in 24m21s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-19 12:27:06 +02:00
9def90daa7 show information that people should mark msgs as read if there are more than 10 unread msgs
Some checks failed
CI/CD Pipeline / test (push) Failing after 15m47s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-19 12:06:24 +02:00
Marie Birner
c528b8831a [TASK] finalize notification styling
Some checks failed
CI/CD Pipeline / test (push) Failing after 15m47s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-19 11:25:25 +02:00
Marie Birner
30756ad4aa [TASK] improve styling
Some checks failed
CI/CD Pipeline / test (push) Failing after 15m38s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-19 11:09:31 +02:00
8aa4f3577a Merge pull request 'cleaner logs' (#408) from cleaner-logs into main
Some checks failed
CI/CD Pipeline / test (push) Failing after 10m28s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #408
2024-04-19 10:40:40 +02:00
6416356d89 Merge pull request 'cleaner logs' (#407) from cleaner-logs into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m47s
CI/CD Pipeline / deploy-staging (push) Successful in 5m31s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #407
2024-04-19 10:40:35 +02:00
bc2790fd4d cleaner logs
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) Has been skipped
2024-04-19 09:16:55 +02:00
b0ceb38e22 Merge pull request 'improve error msg if event is locked' (#405) from improve-error-msg into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m57s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m32s
Reviewed-on: #405
2024-04-19 08:47:43 +02:00
377be7c3b7 Merge pull request 'improve error msg if event is locked' (#404) from improve-error-msg into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m58s
CI/CD Pipeline / deploy-staging (push) Successful in 5m37s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #404
2024-04-19 08:47:19 +02:00
96c07c0eb3 improve error msg if event is locked
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-19 08:45:56 +02:00
010e600aa6 Merge pull request 'improve error msg if event is locked' (#403) from improve-error-msg into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m45s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m32s
Reviewed-on: #403
2024-04-18 21:18:53 +02:00
cf46032f24 Merge pull request 'improve error msg if event is locked' (#402) from improve-error-msg into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m3s
CI/CD Pipeline / deploy-staging (push) Successful in 5m39s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #402
2024-04-18 21:18:22 +02:00
ff27eb5eed improve error msg if event is locked
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m17s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-18 21:17:26 +02:00
aecfb27d6e Merge pull request 'notification-badge' (#400) from notification-badge into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m11s
CI/CD Pipeline / deploy-staging (push) Successful in 5m33s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #400
2024-04-17 14:43:37 +02:00
686feaf66b Merge branch 'main' into notification-badge
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m1s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-17 14:10:14 +02:00
c658ea133d Merge pull request 'allow-boat-deletion' (#398) from allow-boat-deletion 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: #398
2024-04-17 14:08:00 +02:00
cf56e8f6fe Merge pull request 'allow deletion of boat' (#399) from allow-boat-deletion into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m50s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m30s
Reviewed-on: #399
2024-04-17 14:07:55 +02:00
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