allow-reservation-edits #424

Merged
philipp merged 21 commits from allow-reservation-edits into main 2024-04-23 23:23:13 +02:00

21 Commits

Author SHA1 Message Date
cfec4ef8b3 Merge branch 'main' into allow-reservation-edits
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-23 23:10:02 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
ef85d30846 Merge pull request 'fix-logs' (#392) from fix-logs into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m47s
CI/CD Pipeline / deploy-staging (push) Successful in 5m28s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #392
2024-04-17 12:22:32 +02:00
4d3af37d5f Merge pull request 'favicon' (#390) from favicon into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m1s
CI/CD Pipeline / deploy-staging (push) Successful in 5m32s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #390
2024-04-17 11:41:26 +02:00
6956e4c487 Merge pull request 'styling-mail' (#388) from styling-mail into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m50s
CI/CD Pipeline / deploy-staging (push) Successful in 5m33s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #388
2024-04-17 11:10:45 +02:00
558f600271 Merge pull request 'no space before '/'' (#386) from fix-spacing into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m5s
CI/CD Pipeline / deploy-staging (push) Successful in 5m33s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #386
2024-04-16 20:06:33 +02:00