1722 Commits

Author SHA1 Message Date
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
ac587a1b1c Merge pull request 'fix ci' (#302) from fix-ci into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#302
2024-03-21 21:03:35 +01:00
905a22e7c0 fix ci 2024-03-21 21:02:52 +01:00
15e3680a97 merger :-) 2024-03-21 20:55:47 +01:00
9eb91ee2d4 Merge pull request 'notification' (#301) from notification into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#301
2024-03-21 20:51:41 +01:00
266a3b978e Merge branch 'notification' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into notification 2024-03-21 20:50:31 +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
3416373b8f update wording 2024-03-21 20:50:25 +01:00
f2874a4c1b Merge branch 'staging' into notification 2024-03-21 20:49:56 +01:00
a27e9612e4 Merge pull request 'notification' (#292) from notification into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#292
2024-03-21 20:48:20 +01:00
04b09983bc format with djlint 2024-03-21 20:47:48 +01:00
Marie Birner
7050d68293 [TASK] style notifications, add rowing icon and refactor menu 2024-03-21 20:42:49 +01:00
d1067988c6 update wording 2024-03-21 19:38:47 +01:00
257a682eb4 Merge branch 'main' into notification 2024-03-21 00:27:11 +01:00
80cc614390 Merge pull request '...' (#300) from fix-ci into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#300
2024-03-21 00:26:54 +01:00
431accb20e Merge pull request 'fix-ci' (#299) from fix-ci into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#299
2024-03-21 00:26:35 +01:00
58db070cc0 ... 2024-03-21 00:26:10 +01:00
31348a6a93 Merge branch 'main' into notification 2024-03-21 00:18:18 +01:00
f50ea78e3f Merge pull request 'fix ci' (#298) from fix-ci into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#298
2024-03-21 00:17:44 +01:00
8792dc7cbf Merge pull request 'fix-ci' (#297) from fix-ci into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#297
2024-03-21 00:17:07 +01:00
59e5f48589 fix ci 2024-03-21 00:16:29 +01:00
4624dfaf17 Merge branch 'main' into notification 2024-03-20 23:52:37 +01:00
5ddc302048 Merge pull request 'update deps' (#296) from update-deps into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#296
2024-03-20 23:51:59 +01:00
2d4b433144 Merge pull request 'update-deps' (#295) from update-deps into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#295
2024-03-20 23:51:39 +01:00
0d8040c00e update deps 2024-03-20 23:51:00 +01:00
b920d65f1a Merge pull request 'dont log pdf content' (#294) from dont-log-pdf-content into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#294
2024-03-20 23:50:09 +01:00