Commit Graph

  • 61c67d78da Merge pull request 'allow admin to send notifications' (#351) from staging into main philipp 2024-04-08 19:36:35 +02:00
  • 64d32e2688 allow admin to send notifications philipp 2024-04-08 19:35:31 +02:00
  • 1aba6948ee Merge pull request 'only allow people with 'donau linz' role to be in logbook' (#350) from staging into main philipp 2024-04-08 19:05:29 +02:00
  • 3b9103e9aa fix membership application error philipp 2024-04-08 19:04:57 +02:00
  • db3158d4e7 only allow people with 'donau linz' role to be in logbook philipp 2024-04-07 23:17:06 +02:00
  • 08a970853a Merge pull request 'better text for boat reservation' (#349) from staging into main philipp 2024-04-07 22:13:32 +02:00
  • 7cbfafa5c5 better text for boat reservation philipp 2024-04-07 22:12:56 +02:00
  • c64f392fe7 Merge pull request 'improve header of list' (#348) from staging into main philipp 2024-04-07 20:12:22 +02:00
  • 4fef4ca2c6 improve header of list philipp 2024-04-07 20:11:41 +02:00
  • 268c2018ae Merge pull request 'allow to search by nickname' (#347) from staging into main philipp 2024-04-07 15:31:07 +02:00
  • b7e8e1fa37 keep defaults philipp 2024-04-07 15:30:52 +02:00
  • fe6af27813 allow to search by nickname philipp 2024-04-07 15:26:37 +02:00
  • a2005c55aa Merge pull request 'show boats w/o km' (#346) from staging into main philipp 2024-04-06 21:17:43 +02:00
  • da446c5073 show boats w/o km philipp 2024-04-06 21:17:23 +02:00
  • d3bc2bea4f Merge pull request 'staging' (#345) from staging into main philipp 2024-04-06 20:00:25 +02:00
  • 37fcdb81bc remove unnecessary if philipp 2024-04-06 19:57:42 +02:00
  • b3041d9ca7 also show boats w/o any km philipp 2024-04-06 19:56:06 +02:00
  • 7c8f20623c Merge pull request 'show owner of boat in boat km list' (#344) from staging into main philipp 2024-04-06 18:57:57 +02:00
  • 8b07ace876 show owner of boat in boat km list philipp 2024-04-06 18:55:38 +02:00
  • 073b2aca04 Merge pull request 'don't show external cox as cox' (#343) from staging into main philipp 2024-04-06 18:40:29 +02:00
  • 934795abd8 don't show external cox as cox philipp 2024-04-06 18:40:01 +02:00
  • c3965c9528 Merge pull request 'staging' (#342) from staging into main philipp 2024-04-06 18:29:27 +02:00
  • 5164ce1f02 show list of coxes philipp 2024-04-06 18:27:20 +02:00
  • 18cdb20923 Merge pull request 'fancier-boat-stats' (#341) from fancier-boat-stats into main philipp 2024-04-06 17:56:07 +02:00
  • 85a61dfdc0 Merge pull request 'fancier-boat-stats' (#340) from fancier-boat-stats into staging philipp 2024-04-06 17:54:42 +02:00
  • c094097af7 don't show boats which are still on the water philipp 2024-04-06 17:54:07 +02:00
  • 39ba7d53dd make table readable philipp 2024-04-06 17:44:05 +02:00
  • 98fc037f73 Merge pull request 'fancier boat stats' (#339) from fancier-boat-stats into staging philipp 2024-04-06 15:28:28 +02:00
  • 955f657298 fancier boat stats philipp 2024-04-06 15:27:35 +02:00
  • 853f9d901e Merge pull request 'staging' (#338) from staging into main philipp 2024-04-03 18:07:59 +02:00
  • d0c2b4d703 don't show duplicate boats for rennrowing philipp 2024-04-03 18:07:20 +02:00
  • 1af3838ebc use proper timezone philipp 2024-04-03 08:13:32 +02:00
  • d0bbf8f181 Merge pull request 'staging' (#337) from staging into main philipp 2024-04-03 08:07:48 +02:00
  • 8c8a5c9762 show boats which have place in boatshouse philipp 2024-04-03 08:07:16 +02:00
  • b0ea0668c7 Merge pull request 'reservations' (#327) from reservations into main philipp 2024-04-02 21:46:18 +02:00
  • 4e1de0c886 Merge pull request 'show 'no reservations' if no reservations :-)' (#336) from reservations into staging philipp 2024-04-02 21:31:53 +02:00
  • 244eb1be07 show 'no reservations' if no reservations :-) philipp 2024-04-02 21:31:02 +02:00
  • 06f9fcc427 Merge pull request 'reservations' (#335) from reservations into staging philipp 2024-04-02 21:12:14 +02:00
  • 784deaf9f4 deployed :-) philipp 2024-04-02 21:11:31 +02:00
  • 3b63cafa79 Merge branch 'staging' into reservations philipp 2024-04-02 21:09:47 +02:00
  • 0fe672c9da Merge branch 'main' into staging philipp 2024-04-02 21:08:35 +02:00
  • 37ab6e9132 reorder ergo entry philipp 2024-04-02 21:07:58 +02:00
  • 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