|
b6b88ead37
|
Merge branch 'staging' into format-tera
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-24 09:46:54 +02:00 |
|
|
6b3851bfe4
|
Merge pull request 'format tera w/ linter' (#430) from format-tera into main
CI/CD Pipeline / test (push) Successful in 14m0s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 7m19s
Reviewed-on: #430
|
2024-04-24 09:46:19 +02:00 |
|
|
a0dbd0f490
|
implement first draft of switching handoperatable boats
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-24 09:37:45 +02:00 |
|
|
3f80cb498c
|
format tera w/ linter
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-24 08:57:41 +02:00 |
|
|
7ba5070df3
|
Merge pull request 'group-reservations-in-log' (#426) from group-reservations-in-log into main
CI/CD Pipeline / test (push) Successful in 13m22s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 7m1s
Reviewed-on: #426
|
2024-04-24 08:53:52 +02:00 |
|
|
cc1a7106cb
|
Merge pull request 'group-reservations-in-log' (#425) from group-reservations-in-log into staging
CI/CD Pipeline / test (push) Successful in 13m51s
CI/CD Pipeline / deploy-staging (push) Successful in 7m5s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #425
|
2024-04-24 08:51:38 +02:00 |
|
|
d4218289f0
|
fix ci
CI/CD Pipeline / test (push) Successful in 22m5s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
|
2024-04-24 08:27:54 +02:00 |
|
|
349a9f843c
|
fix ci
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-24 07:39:44 +02:00 |
|
|
982bb3b5c8
|
Merge pull request 'fix ci' (#428) from fix-ci into main
CI/CD Pipeline / test (push) Successful in 13m30s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 7m30s
Reviewed-on: #428
|
2024-04-24 07:21:34 +02:00 |
|
|
b4f38089ee
|
Merge pull request 'fix-ci' (#427) from fix-ci into staging
CI/CD Pipeline / test (push) Successful in 14m21s
CI/CD Pipeline / deploy-staging (push) Successful in 7m25s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #427
|
2024-04-24 07:20:50 +02:00 |
|
|
e22dd8eb51
|
fix ci
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-24 07:20:16 +02:00 |
|
|
ac9c4b256e
|
Merge pull request 'allow-reservation-edits' (#424) from allow-reservation-edits into main
CI/CD Pipeline / test (push) Failing after 6m2s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #424
|
2024-04-23 23:23:10 +02:00 |
|
|
cfec4ef8b3
|
Merge branch 'main' into allow-reservation-edits
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 |
|
|
a424e79cba
|
Merge pull request 'allow-reservation-edits' (#423) from allow-reservation-edits into staging
CI/CD Pipeline / test (push) Failing after 6m7s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #423
|
2024-04-23 23:05:47 +02:00 |
|
Marie Birner
|
be24001b4b
|
Merge branch 'allow-reservation-edits' into staging
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
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 |
|
Marie Birner
|
6c2e0669d5
|
[TASK] improve sorting boats in schnellauswahl
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 22:46:05 +02:00 |
|
Marie Birner
|
e556b1375d
|
[TASK] improve styling boat list
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 22:39:59 +02:00 |
|
Marie Birner
|
23a623bdc9
|
[TASK] add etsch edge case js
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:36:51 +02:00 |
|
Marie Birner
|
b1d48a5154
|
[TASK] improve sidebar css
|
2024-04-23 22:35:52 +02:00 |
|
|
61261c9816
|
allow edits of boatreservations, Fixes #417
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 |
|
|
f993eae27f
|
Merge pull request 'add script to fetch current db' (#422) from fetch-db-script into main
CI/CD Pipeline / test (push) Successful in 13m56s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 7m39s
Reviewed-on: #422
|
2024-04-23 21:12:37 +02:00 |
|
|
f1ee266288
|
Merge pull request 'add script to fetch current db' (#421) from fetch-db-script into staging
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 |
|
|
9aefc814a7
|
Merge pull request '[TASK] group reservations in log to avoid near-duplicates' (#420) from group-reservations-in-log into main
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: #420
|
2024-04-23 21:11:42 +02:00 |
|
|
548c025fbc
|
Merge pull request '[TASK] group reservations in log to avoid near-duplicates' (#419) from group-reservations-in-log into staging
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
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
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 |
|
|
32dee2c320
|
Merge pull request 'allow to upload membership pdf for users which don't have it' (#416) from allow-membership-uploads into main
CI/CD Pipeline / test (push) Successful in 12m49s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 6m48s
Reviewed-on: #416
|
2024-04-22 10:37:49 +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
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
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 |
|
|
4a7cd2f085
|
Merge pull request 'update deps' (#414) from update-deps into main
CI/CD Pipeline / test (push) Successful in 12m5s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 7m0s
Reviewed-on: #414
|
2024-04-19 16:38:31 +02:00 |
|
|
27b124cce5
|
Merge pull request 'update deps' (#413) from update-deps into staging
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
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 |
|
|
31d45d6ab4
|
Merge pull request 'notification-badge' (#401) from notification-badge into main
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: #401
|
2024-04-19 16:36:16 +02:00 |
|
|
c122dea6a9
|
Merge pull request 'notification-badge' (#409) from notification-badge into staging
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
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
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
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
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
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
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
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
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
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
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
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
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 |
|