Commit Graph

  • 629c107277 Merge pull request 'fix ci' (#1208) from fix-ci into main main philipp 2026-05-01 08:35:40 +02:00
  • c1fc75b187 Merge pull request 'fix ci' (#1207) from fix-ci into staging staging philipp 2026-05-01 08:35:29 +02:00
  • fbd9115eb2 Merge pull request 'clean /log by only showing boat reservation for the next 3 days' (#1205) from clean-log into main philipp 2026-05-01 08:33:35 +02:00
  • 910c51d01f fix ci philipp 2026-05-01 08:32:51 +02:00
  • c2d8427e1a Merge pull request 'Merge pull request 'be able to delete nomembership user' (#1198) from delete-no-membership-user into main' (#1204) from clean-log into staging philipp 2026-04-30 11:40:46 +02:00
  • 79687807f2 clean /log by only showing boat reservation for the next 3 days Philipp Hofer 2026-04-30 11:39:54 +02:00
  • 09defdc1f4 Merge pull request 'be able to delete nomembership user' (#1198) from delete-no-membership-user into main philipp 2026-03-20 08:40:13 +01:00
  • 45f595e147 Merge pull request 'delete-no-membership-user' (#1197) from delete-no-membership-user into staging philipp 2026-03-20 08:39:58 +01:00
  • 1beb6ebfe9 be able to delete nomembership user Philipp Hofer 2026-03-20 08:37:24 +01:00
  • 55666a6eff Merge pull request 'be able to change membership status on non-membership users' (#1195) from fix-user into main philipp 2026-03-16 10:04:05 +01:00
  • de357c3db3 Merge pull request 'fix-user' (#1193) from fix-user into staging philipp 2026-03-16 10:00:56 +01:00
  • 0e4c0573d9 be able to change membership status on non-membership users philipp 2026-03-16 08:57:56 +01:00
  • 6d36d01c2f Merge pull request 'user merging should only be done by admins' (#1183) from user-upd into main philipp 2026-01-08 20:23:22 +01:00
  • b2157a31c5 Merge pull request 'user merging should only be done by admins' (#1182) from user-upd into staging philipp 2026-01-08 20:23:08 +01:00
  • 2ed22d6440 user merging should only be done by admins philipp 2026-01-08 20:22:17 +01:00
  • 13de487b10 Merge pull request 'show all users on ranking board; be able to merge users' (#1181) from user-upd into main philipp 2026-01-08 20:16:42 +01:00
  • bfb3ae4b6e Merge pull request 'user-upd' (#1180) from user-upd into staging philipp 2026-01-08 20:15:41 +01:00
  • 3fcf24958b show all users on ranking board; be able to merge users philipp 2026-01-08 20:14:57 +01:00
  • f8ea6d5aa5 Merge pull request 'new sort option' (#1179) from new-sort-option into main philipp 2026-01-05 13:09:24 +01:00
  • 88a3e5f2d0 Merge pull request 'Merge pull request 'force an action on important notifications' (#1177) from force-action-on-important-notifications into main' (#1178) from new-sort-option into staging philipp 2026-01-05 13:09:12 +01:00
  • 9f9ec2f812 new sort option Philipp Hofer 2026-01-05 13:08:40 +01:00
  • e5c9f30dd5 Merge pull request 'force an action on important notifications' (#1177) from force-action-on-important-notifications into main philipp 2026-01-03 22:12:11 +01:00
  • 32c250536d Merge pull request 'force-action-on-important-notifications' (#1176) from force-action-on-important-notifications into staging philipp 2026-01-03 22:11:55 +01:00
  • 0ccd59f8a7 force an action on important notifications philipp 2026-01-03 22:11:11 +01:00
  • b9d0e2a2dc Merge pull request 'show-full-stats' (#1172) from show-full-stats into staging philipp 2026-01-03 21:49:14 +01:00
  • fe0761a4c8 Merge pull request 'add manual deploy option' (#1175) from manual-deploy into main philipp 2026-01-03 21:43:07 +01:00
  • b597898bdf Merge pull request 'manual-deploy' (#1174) from manual-deploy into staging philipp 2026-01-03 21:43:02 +01:00
  • 7971cedf39 add manual deploy option philipp 2026-01-03 21:42:22 +01:00
  • 761e99ae8d Merge pull request 'be able to show total km of each rower' (#1173) from show-full-stats into main philipp 2026-01-03 21:27:57 +01:00
  • 2aa6def560 be able to show total km of each rower philipp 2026-01-03 21:26:20 +01:00
  • 48e1ee0d4c Merge pull request 'handle-deleted-boats' (#1170) from handle-deleted-boats into main philipp 2026-01-03 14:18:37 +01:00
  • e90555214a Merge pull request 'No need to pay for deleted boats' (#1169) from handle-deleted-boats into staging philipp 2026-01-03 14:04:39 +01:00
  • a891fb4803 No need to pay for deleted boats philipp 2026-01-03 13:27:55 +01:00
  • ec6c31848d Merge pull request 'yearly cleanup of roles; fixes #941' (#1161) from yeaerly-cleanup into main philipp 2025-11-21 10:35:16 +01:00
  • c92c5526c3 Merge pull request 'yeaerly-cleanup' (#1160) from yeaerly-cleanup into staging philipp 2025-11-21 10:35:07 +01:00
  • 3148d744e6 yearly cleanup of roles; fixes #941 philipp 2025-11-21 10:32:59 +01:00
  • 43d9dcc31a more-robust-ui-tests (#1158) philipp 2025-11-20 19:21:11 +01:00
  • 5c1d8876be more-robust-ui-tests (#1157) philipp 2025-11-20 19:20:43 +01:00
  • 24fe027f7b Merge pull request 'bank-name-mention' (#1156) from bank-name-mention into main philipp 2025-11-20 08:19:22 +01:00
  • e89c5c7439 Merge pull request 'Update src/model/mail.rs' (#1155) from bank-name-mention into staging philipp 2025-11-20 08:19:19 +01:00
  • b605f82af7 Update src/model/mail.rs philipp 2025-11-20 08:16:30 +01:00
  • 1add5c2a2a Merge pull request 'enable self-enrollment to ergo challenge' (#1148) from allow-ergo-entry into main philipp 2025-10-07 19:09:23 +02:00
  • a59d8c0331 Merge pull request 'enable self-enrollment to ergo challenge' (#1147) from allow-ergo-entry into staging philipp 2025-10-07 19:08:49 +02:00
  • 567f31dd3d enable self-enrollment to ergo challenge philipp 2025-10-07 19:08:20 +02:00
  • eec485dced Merge pull request 'allow ergo entry' (#1146) from allow-ergo-entry into main philipp 2025-10-07 18:54:03 +02:00
  • 71760a500f Merge pull request 'allow-ergo-entry' (#1145) from allow-ergo-entry into staging philipp 2025-10-07 18:53:41 +02:00
  • b48b689aeb allow ergo entry philipp 2025-10-07 18:53:13 +02:00
  • 9f57cbaa71 Merge pull request 'add-ergo-role' (#1143) from add-ergo-role into main philipp 2025-10-07 16:53:06 +02:00
  • a1b18d6f92 Merge pull request 'nicer formatting' (#1144) from add-ergo-role into staging philipp 2025-10-07 16:52:57 +02:00
  • 284a853344 nicer formatting Philipp Hofer 2025-10-07 16:52:01 +02:00
  • 465a42acac Merge pull request 'also show button again' (#1142) from add-ergo-role into staging philipp 2025-10-07 16:24:37 +02:00
  • ebce600356 also show button again Philipp Hofer 2025-10-07 16:04:44 +02:00
  • 6e418b6f2f Merge pull request 'fix-cii' (#1140) from fix-cii into staging philipp 2025-10-02 09:02:39 +02:00
  • 328a8e3e35 Merge pull request 'fix-cii' (#1139) from fix-cii into main philipp 2025-10-02 09:02:28 +02:00
  • bfb95610f6 fix ci? philipp 2025-10-02 08:40:46 +02:00
  • 68674dd1c5 debug philipp 2025-10-02 08:38:03 +02:00
  • 9a16ce0c21 Merge pull request 'restore-fix-ci' (#1138) from restore-fix-ci into staging philipp 2025-10-02 00:35:29 +02:00
  • 16689318eb Merge pull request 'Restore content from fix-ci-finally' (#1137) from restore-fix-ci into main philipp 2025-10-02 00:35:21 +02:00
  • b12ea81bbf Restore content from fix-ci-finally philipp 2025-10-02 00:34:12 +02:00
  • 49a638d595 Merge pull request 'replace-main-with-fix' (#1136) from replace-main-with-fix into main philipp 2025-10-02 00:32:24 +02:00
  • 452d257c7a Merge pull request 'replace-main-with-fix' (#1135) from replace-main-with-fix into staging philipp 2025-10-02 00:32:15 +02:00
  • 599eec0e43 Replace main content with fix-ci-finally philipp 2025-10-02 00:29:28 +02:00
  • 433c914c4a fix ci philipp 2025-10-02 00:25:43 +02:00
  • 0338351eef reduce npm warnings philipp 2025-10-01 23:46:49 +02:00
  • e1803aea3e Merge pull request 'update deps, fix ci' (#1134) from no-ergo into main philipp 2025-10-01 22:41:40 +02:00
  • 6f491e20e5 Merge pull request 'update deps, fix ci' (#1133) from no-ergo into staging philipp 2025-10-01 22:41:32 +02:00
  • 7f26710a40 fix ci? philipp 2025-10-01 22:24:13 +02:00
  • 9203c61541 fix ci? philipp 2025-10-01 22:07:21 +02:00
  • 3a57a1334d update npm mods philipp 2025-10-01 21:44:24 +02:00
  • 72c19d7a75 Merge pull request 'no ergo yet' (#1132) from no-ergo into main philipp 2025-10-01 20:25:08 +02:00
  • 8b25076599 Merge pull request 'no-ergo' (#1131) from no-ergo into staging philipp 2025-10-01 20:24:26 +02:00
  • a44f8b445c no ergo yet philipp 2025-10-01 20:23:09 +02:00
  • 5ec457fea7 Merge pull request 'log-frontend-test-logs' (#1119) from log-frontend-test-logs into main philipp 2025-07-24 11:51:49 +02:00
  • 3ce95ecb49 Merge pull request 'log-frontend-test-logs' (#1118) from log-frontend-test-logs into staging philipp 2025-07-24 11:46:53 +02:00
  • 4fcd34cfa9 generate html report philipp 2025-07-24 11:23:39 +02:00
  • d64f6f61ba reduce useless compiler warnings philipp 2025-07-24 11:23:32 +02:00
  • 5934bbe666 Merge pull request 'get errors' (#1117) from log-frontend-test-logs into main philipp 2025-07-24 11:01:53 +02:00
  • f08764c3d1 Merge pull request 'get errors' (#1116) from log-frontend-test-logs into staging philipp 2025-07-24 11:01:33 +02:00
  • b7cc01ff1c get errors philipp 2025-07-24 11:00:49 +02:00
  • e9a78db048 Merge pull request 'families only have to pay einschriebgebuehr once + half price applies' (#1115) from fix-family-fees into main philipp 2025-07-24 08:55:43 +02:00
  • b52e3160d5 Merge pull request 'fix-family-fees' (#1114) from fix-family-fees into staging philipp 2025-07-24 08:55:30 +02:00
  • 0996a81d52 families only have to pay einschriebgebuehr once + half price applies philipp 2025-07-24 08:52:26 +02:00
  • 25df7a935c Merge pull request '[BUGFIX] set max items in choices.js after searching' (#1113) from show-daniels into main philipp 2025-07-20 12:02:13 +02:00
  • 6f7077adf4 Merge pull request 'show-daniels' (#1112) from show-daniels into staging philipp 2025-07-20 12:01:55 +02:00
  • 55c0647b55 [BUGFIX] set max items in choices.js after searching Marie Birner 2025-07-20 11:57:45 +02:00
  • 397092bff5 [NPM] update choices.js to 11.1.0 to set searchResultLimit -1 mb-npm-choices Marie Birner 2025-07-20 11:46:59 +02:00
  • 627a515a42 Merge pull request 'upda' (#1111) from upda into main philipp 2025-07-20 11:33:56 +02:00
  • 4b2107d0f6 Merge pull request 'upda' (#1109) from upda into staging philipp 2025-07-20 11:33:04 +02:00
  • 1c6421139d fördernde user can 1x row philipp 2025-07-20 11:31:33 +02:00
  • f4509b8504 new server philipp 2025-07-20 11:31:12 +02:00
  • b53b8b6f0b Merge pull request 'fix path' (#1108) from new-server into main philipp 2025-07-19 13:24:12 +02:00
  • de544b9c98 Merge pull request 'fix path' (#1107) from new-server into staging philipp 2025-07-19 13:23:56 +02:00
  • 3f76e5be78 fix path philipp 2025-07-19 13:23:14 +02:00
  • a14a76399e Merge pull request 'it's okay to not have this already' (#1106) from new-server into main philipp 2025-07-19 10:54:02 +02:00
  • 302ff3c8a3 Merge pull request 'it's okay to not have this already' (#1105) from new-server into staging philipp 2025-07-19 10:53:26 +02:00
  • b15050cd63 it's okay to not have this already philipp 2025-07-19 10:52:19 +02:00
  • 2907ed5caf Merge pull request 'fix path' (#1104) from new-server into main philipp 2025-07-19 07:04:41 +02:00
  • 657b378169 Merge pull request 'fix path' (#1103) from new-server into staging philipp 2025-07-19 07:04:28 +02:00
  • bc8cd88af4 fix path philipp 2025-07-19 07:03:12 +02:00
  • 539d299c1a Merge pull request 'move to new server' (#1102) from new-server into main philipp 2025-07-18 18:58:14 +02:00