2148 Commits

Author SHA1 Message Date
784deaf9f4 deployed :-) 2024-04-02 21:11:31 +02:00
3b63cafa79 Merge branch 'staging' into reservations 2024-04-02 21:09:47 +02:00
0fe672c9da Merge branch 'main' into staging 2024-04-02 21:08:35 +02:00
37ab6e9132 reorder ergo entry 2024-04-02 21:07:58 +02:00
53afb4ee6f [TASK] style boat reservation 2024-04-02 20:59:09 +02:00
1783527f39 Merge branch 'main' into reservations 2024-04-02 11:19:51 +02:00
e7a679541b Merge pull request 'fix-notification-content' (#334) from fix-notification-content into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#334
2024-04-02 10:38:19 +02:00
32b2185e94 Merge pull request 'fix-notification-content' (#333) from fix-notification-content into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#333
2024-04-02 10:37:48 +02:00
c1d46a6e6b fix ci 2024-04-02 10:37:15 +02:00
1c43d83bd4 use proper name :-) 2024-04-02 10:34:50 +02:00
6fb27d52d6 Merge branch 'main' into reservations 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
Reviewed-on: Ruderverein-Donau-Linz/rowt#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
Reviewed-on: Ruderverein-Donau-Linz/rowt#332
2024-03-31 13:09:21 +02:00
ef4e6f57d9 only show read notifications for last 30 days 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
Reviewed-on: Ruderverein-Donau-Linz/rowt#330
2024-03-30 09:17:59 +01:00
0ba2590bfd hide reservations if there are none; clean code 2024-03-30 09:17:32 +01:00
cccf62bb53 Merge pull request 'reservations' (#326) from reservations into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#326
2024-03-30 01:50:54 +01:00
649169c192 reservations 2024-03-30 01:36:37 +01:00
1caced26d6 Merge pull request 'proper log for registering guests' (#325) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#325
2024-03-29 21:46:58 +01:00
163c97b2f5 proper log for registering guests 2024-03-29 21:46:15 +01:00
7a28f0360d Merge pull request 'allow planned_event role to add guests' (#324) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#324
2024-03-29 21:29:38 +01:00
a5ed2cb9e3 allow planned_event role to add guests 2024-03-29 21:29:06 +01:00
35333324ed Merge pull request 'staging' (#323) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#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 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
Reviewed-on: Ruderverein-Donau-Linz/rowt#320
2024-03-28 09:08:51 +01:00
4549043a08 Merge pull request 'bugfix-mobile-menu' (#319) from bugfix-mobile-menu into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#319
2024-03-28 09:08:36 +01:00
Marie Birner
47986df47e [BUGFIX] mobile menu fix styling 2024-03-28 09:05:32 +01:00
42a1579cd1 Merge pull request 'show new notifications for boatdamages; Fixes #310' (#318) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#318
2024-03-28 08:34:29 +01:00
a36fc300f0 show new notifications for boatdamages; Fixes #310 2024-03-28 08:34:02 +01:00
c5af1e4cf8 Merge pull request 'show new notifications @ top' (#317) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#317
2024-03-28 08:11:37 +01:00
ab565f1369 show new notifications @ top 2024-03-28 08:10:26 +01:00
3e859ebc7b Merge pull request 'update deps' (#316) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#316
2024-03-27 14:55:25 +01:00
2b05828f6f update deps 2024-03-27 14:53:54 +01:00
df72ec9d8a Merge pull request 'only use membership_pdf when necessary' (#314) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#314
2024-03-26 12:35:19 +01:00
bf04ff780f only use membership_pdf when necessary 2024-03-26 12:34:19 +01:00
64ca6caa3c Merge pull request 'add /planned to quick menu' (#313) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#313
2024-03-24 14:03:23 +01:00
9b70875c72 add /planned to quick menu 2024-03-24 14:02:22 +01:00
5d55a10ad0 Merge pull request 'better wording for notification' (#312) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#312
2024-03-22 21:04:23 +01:00
272b6f3eb1 better wording for notification 2024-03-22 21:03:43 +01:00
890f6cce3f Merge pull request 'staging' (#311) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#311
2024-03-22 20:50:29 +01:00
67eea1beb0 remove boat reservation 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
Reviewed-on: Ruderverein-Donau-Linz/rowt#307
2024-03-21 22:20:58 +01:00
c007ae6fb8 Merge pull request 'bugfix' (#306) from bugfix into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#306
2024-03-21 22:20:50 +01:00
Marie Birner
b9f11281e5 [BUGFIX] close div index html 2024-03-21 21:58:27 +01:00
2e4a9a1168 Merge pull request 'merger :-)' (#305) from remove-merged-staging-diff into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#305
2024-03-21 21:04:30 +01:00
53ca2c24c1 Merge pull request 'merger :-)' (#304) from remove-merged-staging-diff into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#304
2024-03-21 21:04:14 +01:00
42e032e977 Merge pull request 'fix-ci' (#303) from fix-ci into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#303
2024-03-21 21:03:55 +01:00