1657 Commits

Author SHA1 Message Date
bf04ff780f only use membership_pdf when necessary 2024-03-26 12:34:19 +01:00
9b70875c72 add /planned to quick menu 2024-03-24 14:02:22 +01:00
272b6f3eb1 better wording for notification 2024-03-22 21:03:43 +01:00
67eea1beb0 remove boat reservation 2024-03-22 20:49:56 +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
9c277df2b7 Merge pull request 'dont log pdf content' (#293) from dont-log-pdf-content into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#293
2024-03-20 23:49:21 +01:00
591f9ea245 dont log pdf content 2024-03-20 23:48:42 +01:00
bc35afb521 Merge pull request 'notification' (#291) from notification into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#291
2024-03-20 22:23:12 +01:00
6a6afe5e60 Merge branch 'staging' into notification 2024-03-20 22:22:38 +01:00
63af74662f Merge branch 'main' into notification 2024-03-20 22:21:12 +01:00
e3afe8c2ae Merge pull request 'push' (#290) from only-show-input-when-possible into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#290
2024-03-20 22:14:10 +01:00
c9270b2c54 Merge pull request 'only-show-input-when-possible' (#289) from only-show-input-when-possible into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#289
2024-03-20 22:13:48 +01:00
ac90dbedea push 2024-03-20 22:13:18 +01:00
0dcf941cd1 Merge pull request 'only accept pdf' (#288) from fix-ci into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#288
2024-03-20 21:40:54 +01:00
39306150bb Merge pull request 'only accept pdf' (#287) from fix-ci into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#287
2024-03-20 21:40:33 +01:00
868847f778 only accept pdf 2024-03-20 21:40:08 +01:00
638c13bc53 Merge pull request 'fix-ci' (#286) from fix-ci into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#286
2024-03-20 21:27:44 +01:00
ffce336199 Merge pull request 'fix ci' (#285) from fix-ci into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#285
2024-03-20 21:17:54 +01:00
35900f3059 fix ci 2024-03-20 21:16:55 +01:00
9a1117a7c8 Merge pull request 'membership-pdf-new' (#284) from membership-pdf-new into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#284
2024-03-20 21:05:22 +01:00