Commit Graph

  • 53afb4ee6f [TASK] style boat reservation philipp 2024-04-02 20:59:09 +02:00
  • 1783527f39 Merge branch 'main' into reservations philipp 2024-04-02 11:19:51 +02:00
  • e7a679541b Merge pull request 'fix-notification-content' (#334) from fix-notification-content into main philipp 2024-04-02 10:38:19 +02:00
  • 32b2185e94 Merge pull request 'fix-notification-content' (#333) from fix-notification-content into staging philipp 2024-04-02 10:37:48 +02:00
  • c1d46a6e6b fix ci philipp 2024-04-02 10:37:15 +02:00
  • 1c43d83bd4 use proper name :-) philipp 2024-04-02 10:34:50 +02:00
  • 6fb27d52d6 Merge branch 'main' into reservations philipp 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 philipp 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 philipp 2024-03-31 13:09:21 +02:00
  • ef4e6f57d9 only show read notifications for last 30 days philipp 2024-03-31 13:07:40 +02:00
  • 974b4aeb48 Merge branch 'main' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt philipp 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 philipp 2024-03-30 09:17:59 +01:00
  • 0ba2590bfd hide reservations if there are none; clean code philipp 2024-03-30 09:17:32 +01:00
  • cccf62bb53 Merge pull request 'reservations' (#326) from reservations into staging philipp 2024-03-30 01:50:54 +01:00
  • 649169c192 reservations philipp 2024-03-30 01:36:37 +01:00
  • 1caced26d6 Merge pull request 'proper log for registering guests' (#325) from staging into main philipp 2024-03-29 21:46:58 +01:00
  • 163c97b2f5 proper log for registering guests philipp 2024-03-29 21:46:15 +01:00
  • 7a28f0360d Merge pull request 'allow planned_event role to add guests' (#324) from staging into main philipp 2024-03-29 21:29:38 +01:00
  • a5ed2cb9e3 allow planned_event role to add guests philipp 2024-03-29 21:29:06 +01:00
  • 35333324ed Merge pull request 'staging' (#323) from staging into main philipp 2024-03-29 11:26:16 +01:00
  • 2d36be07d2 Merge branch 'staging' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into staging philipp 2024-03-29 11:25:34 +01:00
  • 183f26e5c3 update boat reservation... philipp 2024-03-29 11:25:25 +01:00
  • 2452d31b9a Merge pull request '[BUGFIX] mobile menu fix styling' (#320) from bugfix-mobile-menu into main philipp 2024-03-28 09:08:51 +01:00
  • 4549043a08 Merge pull request 'bugfix-mobile-menu' (#319) from bugfix-mobile-menu into staging philipp 2024-03-28 09:08:36 +01:00
  • 47986df47e [BUGFIX] mobile menu fix styling Marie Birner 2024-03-28 09:05:32 +01:00
  • 42a1579cd1 Merge pull request 'show new notifications for boatdamages; Fixes #310' (#318) from staging into main philipp 2024-03-28 08:34:29 +01:00
  • a36fc300f0 show new notifications for boatdamages; Fixes #310 philipp 2024-03-28 08:34:02 +01:00
  • c5af1e4cf8 Merge pull request 'show new notifications @ top' (#317) from staging into main philipp 2024-03-28 08:11:37 +01:00
  • ab565f1369 show new notifications @ top philipp 2024-03-28 08:10:26 +01:00
  • 3e859ebc7b Merge pull request 'update deps' (#316) from staging into main philipp 2024-03-27 14:55:25 +01:00
  • 2b05828f6f update deps philipp 2024-03-27 14:53:54 +01:00
  • df72ec9d8a Merge pull request 'only use membership_pdf when necessary' (#314) from staging into main philipp 2024-03-26 12:35:19 +01:00
  • bf04ff780f only use membership_pdf when necessary philipp 2024-03-26 12:34:19 +01:00
  • 64ca6caa3c Merge pull request 'add /planned to quick menu' (#313) from staging into main philipp 2024-03-24 14:03:23 +01:00
  • 9b70875c72 add /planned to quick menu philipp 2024-03-24 14:02:22 +01:00
  • 5d55a10ad0 Merge pull request 'better wording for notification' (#312) from staging into main philipp 2024-03-22 21:04:23 +01:00
  • 272b6f3eb1 better wording for notification philipp 2024-03-22 21:03:43 +01:00
  • 890f6cce3f Merge pull request 'staging' (#311) from staging into main philipp 2024-03-22 20:50:29 +01:00
  • 67eea1beb0 remove boat reservation philipp 2024-03-22 20:49:56 +01:00
  • abefd93be5 add db pic, created with sqleton philipp 2024-03-22 20:48:04 +01:00
  • 1e0096c44b Merge pull request '[BUGFIX] close div index html' (#307) from bugfix into main philipp 2024-03-21 22:20:58 +01:00
  • c007ae6fb8 Merge pull request 'bugfix' (#306) from bugfix into staging philipp 2024-03-21 22:20:50 +01:00
  • b9f11281e5 [BUGFIX] close div index html Marie Birner 2024-03-21 21:58:27 +01:00
  • 2e4a9a1168 Merge pull request 'merger :-)' (#305) from remove-merged-staging-diff into main philipp 2024-03-21 21:04:30 +01:00
  • 53ca2c24c1 Merge pull request 'merger :-)' (#304) from remove-merged-staging-diff into staging philipp 2024-03-21 21:04:14 +01:00
  • 42e032e977 Merge pull request 'fix-ci' (#303) from fix-ci into main philipp 2024-03-21 21:03:55 +01:00
  • ac587a1b1c Merge pull request 'fix ci' (#302) from fix-ci into staging philipp 2024-03-21 21:03:35 +01:00
  • 905a22e7c0 fix ci philipp 2024-03-21 21:02:52 +01:00
  • 15e3680a97 merger :-) philipp 2024-03-21 20:55:47 +01:00
  • 9eb91ee2d4 Merge pull request 'notification' (#301) from notification into staging philipp 2024-03-21 20:51:41 +01:00
  • 266a3b978e Merge branch 'notification' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into notification philipp 2024-03-21 20:50:31 +01:00
  • de1b6b76c9 format with djlint philipp 2024-03-21 20:47:48 +01:00
  • 961cdbad09 [TASK] style notifications, add rowing icon and refactor menu Marie Birner 2024-03-21 20:42:49 +01:00
  • 3416373b8f update wording philipp 2024-03-21 19:38:47 +01:00
  • f2874a4c1b Merge branch 'staging' into notification philipp 2024-03-21 20:49:56 +01:00
  • a27e9612e4 Merge pull request 'notification' (#292) from notification into main philipp 2024-03-21 20:48:20 +01:00
  • 04b09983bc format with djlint philipp 2024-03-21 20:47:48 +01:00
  • 7050d68293 [TASK] style notifications, add rowing icon and refactor menu Marie Birner 2024-03-21 20:42:49 +01:00
  • d1067988c6 update wording philipp 2024-03-21 19:38:47 +01:00
  • 257a682eb4 Merge branch 'main' into notification philipp 2024-03-21 00:27:11 +01:00
  • 80cc614390 Merge pull request '...' (#300) from fix-ci into main philipp 2024-03-21 00:26:54 +01:00
  • 431accb20e Merge pull request 'fix-ci' (#299) from fix-ci into staging philipp 2024-03-21 00:26:35 +01:00
  • 58db070cc0 ... philipp 2024-03-21 00:26:10 +01:00
  • 31348a6a93 Merge branch 'main' into notification philipp 2024-03-21 00:18:18 +01:00
  • f50ea78e3f Merge pull request 'fix ci' (#298) from fix-ci into main philipp 2024-03-21 00:17:44 +01:00
  • 8792dc7cbf Merge pull request 'fix-ci' (#297) from fix-ci into staging philipp 2024-03-21 00:17:07 +01:00
  • 59e5f48589 fix ci philipp 2024-03-21 00:16:29 +01:00
  • 4624dfaf17 Merge branch 'main' into notification philipp 2024-03-20 23:52:37 +01:00
  • 5ddc302048 Merge pull request 'update deps' (#296) from update-deps into main philipp 2024-03-20 23:51:59 +01:00
  • 2d4b433144 Merge pull request 'update-deps' (#295) from update-deps into staging philipp 2024-03-20 23:51:39 +01:00
  • 0d8040c00e update deps philipp 2024-03-20 23:51:00 +01:00
  • b920d65f1a Merge pull request 'dont log pdf content' (#294) from dont-log-pdf-content into main philipp 2024-03-20 23:50:09 +01:00
  • 9c277df2b7 Merge pull request 'dont log pdf content' (#293) from dont-log-pdf-content into staging philipp 2024-03-20 23:49:21 +01:00
  • 591f9ea245 dont log pdf content philipp 2024-03-20 23:48:42 +01:00
  • bc35afb521 Merge pull request 'notification' (#291) from notification into staging philipp 2024-03-20 22:23:12 +01:00
  • 6a6afe5e60 Merge branch 'staging' into notification philipp 2024-03-20 22:22:38 +01:00
  • 63af74662f Merge branch 'main' into notification philipp 2024-03-20 22:21:12 +01:00
  • e3afe8c2ae Merge pull request 'push' (#290) from only-show-input-when-possible into main philipp 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 philipp 2024-03-20 22:13:48 +01:00
  • ac90dbedea push philipp 2024-03-20 22:13:18 +01:00
  • 0dcf941cd1 Merge pull request 'only accept pdf' (#288) from fix-ci into main philipp 2024-03-20 21:40:54 +01:00
  • 39306150bb Merge pull request 'only accept pdf' (#287) from fix-ci into staging philipp 2024-03-20 21:40:33 +01:00
  • 868847f778 only accept pdf philipp 2024-03-20 21:40:08 +01:00
  • 638c13bc53 Merge pull request 'fix-ci' (#286) from fix-ci into staging philipp 2024-03-20 21:27:44 +01:00
  • ffce336199 Merge pull request 'fix ci' (#285) from fix-ci into main philipp 2024-03-20 21:17:54 +01:00
  • 35900f3059 fix ci philipp 2024-03-20 21:16:55 +01:00
  • 9a1117a7c8 Merge pull request 'membership-pdf-new' (#284) from membership-pdf-new into staging philipp 2024-03-20 21:05:22 +01:00
  • e48bc468cd Merge pull request 'add membership pdf' (#283) from membership-pdf-new into main philipp 2024-03-20 21:04:42 +01:00
  • 9fdc1f82bd add membership pdf philipp 2024-03-20 20:59:41 +01:00
  • 9d14dae4a7 notification (#282) philipp 2024-03-20 16:19:12 +01:00
  • 6959f71f96 show additional notification philipp 2024-03-20 16:09:55 +01:00
  • be50e65846 add notifications; fixes #127 philipp 2024-03-20 15:56:34 +01:00
  • 2ebfe7564a Merge branch 'staging' into notification philipp 2024-03-20 14:00:25 +01:00
  • fda2673f5a Merge pull request 'improve boathouse functionality, fixes #261' (#281) from staging into main philipp 2024-03-20 13:59:30 +01:00
  • 68a1153885 improve boathouse functionality, fixes #261 philipp 2024-03-20 13:58:42 +01:00
  • 7614cc8fae Merge pull request 're-wording' (#280) from staging into main philipp 2024-03-20 13:41:28 +01:00
  • c1411b3a76 re-wording philipp 2024-03-20 13:41:14 +01:00
  • 6ad07f35f7 Merge pull request 'show total club km' (#279) from staging into main philipp 2024-03-20 13:34:54 +01:00
  • 5533106aca show total club km philipp 2024-03-20 13:34:21 +01:00
  • f61ffb60d8 Merge pull request 'don't count 'externe steuerkilometer' as guest kms' (#278) from staging into main philipp 2024-03-20 09:16:21 +01:00