Commit Graph

111 Commits

Author SHA1 Message Date
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
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
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
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
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
d58d4642af 1x boats: don't show 'Ruderer: ' in logbook; Fixes #362
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-15 11:23:07 +02:00
7ebbf5661a don't show external boats in boatstat; hide logout in menu; move owner into own column in boatstat
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-14 20:20:22 +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
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
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
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
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
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
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
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
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
868847f778 only accept pdf
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m7s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-20 21:40:08 +01:00
a17a08d018 create temporary boat reservation feature
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m13s
CI/CD Pipeline / deploy-staging (push) Successful in 4m4s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-20 09:15:58 +01:00
c9eecf0a29 create temporary boat reservation feature
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-20 09:14:26 +01:00
8edbf15235 show user icon in all vorstand users
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 15m40s
2024-03-04 16:37:53 +01:00
442257df01 reformat files
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-04 13:28:42 +01:00
9c3ae7434e allow vorstand to see member details, Fixes #199
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-04 09:19:04 +01:00
5781937bee show ottensheim boats to rennjugend
Some checks failed
CI/CD Pipeline / test (push) Failing after 3m20s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-03 20:03:20 +01:00
267becfbce progress @fees, next step, deply+enter families/student/pupil/...
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-01-19 00:39:15 +01:00
07c76f4e64 add family
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-01-18 16:37:54 +01:00
c372051561 try
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-frontend (push) Failing after 13m30s
CI/CD Pipeline / test-backend (push) Has been cancelled
2024-01-16 22:29:57 +01:00
3e2e058bcc limit users to proper role, Fixes #135
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 15m47s
2024-01-10 14:08:15 +01:00
f5bfb9fbdf fix weird iphone issue
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-01-03 09:59:09 +01:00
c7d7d0ca83 in preparation to moving userdata into app, we switched to arbitrary groups
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m4s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-23 21:27:52 +01:00
Marie Birner
3467e02748 [BUGFIX] color label dark-mode 2023-11-09 19:37:46 +01:00
715fae59fc implement default destination for boats 2023-11-09 08:56:08 +01:00
04958d80a4 Merge branch 'staging' into 'input-val'
# Conflicts:
#   templates/ergo.html.tera
#   templates/includes/macros.html.tera
2023-11-08 17:02:32 +00:00
e7a6d57bf0 simple (client only) val 2023-11-08 18:00:27 +01:00
Marie Birner
b465923fa9 [TASK] support dark mode second draft 2023-11-04 19:45:57 +01:00
Marie Birner
97897437a9 [TASK] support dark mode second draft 2023-11-04 19:33:36 +01:00
Marie Birner
2fd053efed Merge commit 'bc9c5198d1a1df7526ee95de9411f8e7d0a60894' into dark-mode 2023-11-04 17:25:14 +01:00
0f8c7a365e push 2023-11-04 16:27:17 +01:00
Marie Birner
5f494dc9e9 [TASK] support dark mode first draft 2023-11-04 00:19:46 +01:00
Marie Birner
c4e3c836e2 [TASK] guest user menu ergo 2023-11-03 14:35:15 +01:00
Marie Birner
150a86c2f1 Merge commit '95e1ea302884fa1214950b6c4005525f7469ac58' into ergo-styling 2023-11-03 14:31:14 +01:00
Marie Birner
8014dba27e [TASK] guest user menu ergo 2023-11-03 14:30:43 +01:00
95e1ea3028 allow guests to see + upload ergo entries; show ergo menu item for guests 2023-11-03 14:20:58 +01:00
f5ad37a0bb auto select owner as rower of private boat, Fixes #46 2023-11-02 19:50:19 +01:00
1ff050a247 add ergo tool 2023-11-02 12:15:10 +01:00
ef0965fad1 Merge branch 'boat-stats' into 'staging'
Boat stats

See merge request PhilippHofer/rot!61
2023-10-31 19:42:42 +00:00