Commit Graph

  • 5ec457fea7 Merge pull request 'log-frontend-test-logs' (#1119) from log-frontend-test-logs into main 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 staging philipp 2025-07-24 11:46:53 +02:00
  • 4fcd34cfa9 generate html report Philipp Hofer 2025-07-24 11:23:39 +02:00
  • d64f6f61ba reduce useless compiler warnings Philipp Hofer 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 Hofer 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 Hofer 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 Hofer 2025-07-20 11:31:33 +02:00
  • f4509b8504 new server Philipp Hofer 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 Hofer 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 Hofer 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 Hofer 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
  • cb65f24f67 Merge pull request 'new-server' (#1101) from new-server into staging philipp 2025-07-18 18:57:33 +02:00
  • f0936c7784 move to new server Philipp Hofer 2025-07-18 18:57:09 +02:00
  • 59478a5ee1 Merge pull request 'fix tests' (#1099) from fix-tetss into main philipp 2025-07-17 21:49:20 +02:00
  • 2bb2942a0f Merge pull request 'fix-tetss' (#1098) from fix-tetss into staging philipp 2025-07-17 21:49:09 +02:00
  • 2f5d483bff fix tests Philipp Hofer 2025-07-17 21:48:31 +02:00
  • 6b78f31aa4 Merge pull request 'kiosk-allow-foerdernde' (#1096) from kiosk-allow-foerdernde into staging philipp 2025-07-13 21:42:09 +02:00
  • 7be9339645 Merge pull request 'merge functionality of kiosk + logged in -> allow kiosk to have fördernde people as rower in logbook' (#1097) from kiosk-allow-foerdernde into main philipp 2025-07-13 19:52:33 +02:00
  • 837d0febdf merge functionality of kiosk + logged in -> allow kiosk to have fördernde people as rower in logbook Philipp Hofer 2025-07-13 19:49:46 +02:00
  • c7f1702663 Merge pull request 'foerderne-user-can-do-trips' (#1093) from foerderne-user-can-do-trips into staging philipp 2025-07-13 09:54:48 +02:00
  • 51c7cf28f8 Merge pull request 'foerderne user can do trips on the water' (#1094) from foerderne-user-can-do-trips into main philipp 2025-07-13 09:26:57 +02:00
  • 80eca1a3b2 foerderne user can do trips on the water Philipp Hofer 2025-07-13 09:22:47 +02:00
  • d1341006f7 Merge pull request 'allow to change from 'bootsfuehrer' to 'cox'' (#1090) from bootsman-to-cox into main philipp 2025-07-03 11:03:50 +02:00
  • ccff9a3752 Merge pull request 'bootsman-to-cox' (#1089) from bootsman-to-cox into staging philipp 2025-07-03 11:03:40 +02:00
  • a534568a39 allow to change from 'bootsfuehrer' to 'cox' Philipp Hofer 2025-07-03 11:02:59 +02:00
  • b4c04cbdd8 Merge pull request 'updates-meeting' (#1085) from updates-meeting into main philipp 2025-06-17 22:53:40 +02:00
  • aac99c86fa Merge pull request 'updates-meeting' (#1084) from updates-meeting into staging philipp 2025-06-17 22:53:07 +02:00
  • 1f0bfb04e4 more updates after meeting Philipp Hofer 2025-06-17 22:52:04 +02:00
  • 86b8d3a30d make clear where note is displayed Philipp Hofer 2025-06-17 22:29:08 +02:00
  • da7a303efb Merge pull request 'fix(?) auto ci' (#1080) from fix-ci into main philipp 2025-06-13 11:08:03 +02:00
  • 2e13acc0b0 Merge pull request 'fix-ci' (#1079) from fix-ci into staging philipp 2025-06-13 11:07:48 +02:00
  • 0a31410ca5 fix(?) auto ci Philipp Hofer 2025-06-13 11:07:00 +02:00
  • f793cb4a9a Merge pull request 'log if a cox creates a trip' (#1076) from log-trip-creation into main philipp 2025-06-09 08:36:49 +02:00
  • 6a59634de3 Merge pull request 'log-trip-creation' (#1075) from log-trip-creation into staging philipp 2025-06-09 08:35:22 +02:00
  • d3b2d78f9f log if a cox creates a trip Philipp Hofer 2025-06-09 08:33:50 +02:00
  • 155adce2e9 Merge pull request 'add license' Fixes #1064' (#1071) from upd into main philipp 2025-05-29 16:06:34 +02:00
  • 63a32f02bf Merge pull request 'add license' Fixes #1064' (#1070) from upd into staging philipp 2025-05-29 16:06:28 +02:00
  • 9548cb4f0b add license' Fixes #1064 Philipp Hofer 2025-05-29 16:05:44 +02:00
  • c42713b86e Merge pull request 'promote calendar in welcome-mail; even more robust name checking' (#1069) from upd into main philipp 2025-05-29 16:02:59 +02:00
  • 429f0c1ddc Merge pull request 'upd' (#1068) from upd into staging philipp 2025-05-29 16:02:37 +02:00
  • d5a92d8f79 promote calendar in welcome-mail; even more robust name checking Philipp Hofer 2025-05-29 16:01:22 +02:00
  • aa3df2a294 Merge pull request 'use proper role instead of manully validating role' (#1066) from use-proper-role into main philipp 2025-05-29 12:12:54 +02:00
  • 0354e4e190 Merge pull request 'fix tests' (#1067) from use-proper-role into staging philipp 2025-05-29 12:12:39 +02:00
  • 7a2743046d fix tests Philipp Hofer 2025-05-29 12:11:48 +02:00
  • 7935d1837f Merge pull request 'use-proper-role' (#1065) from use-proper-role into staging philipp 2025-05-29 12:11:13 +02:00
  • 7027145a9a use proper role instead of manully validating role Philipp Hofer 2025-05-29 12:10:35 +02:00
  • 782d68cd03 Merge pull request 'allow users name to start with ÄÜÖ' (#1063) from fix-uppercase-non-ascii-name into main philipp 2025-05-27 08:54:50 +02:00
  • f769af279b Merge pull request 'fix-uppercase-non-ascii-name' (#1062) from fix-uppercase-non-ascii-name into staging philipp 2025-05-27 08:54:45 +02:00
  • c6a2b529c3 allow users name to start with ÄÜÖ Philipp Hofer 2025-05-27 08:54:15 +02:00
  • b0b2ad2148 Merge pull request 'improve text' (#1061) from nicer-text into main philipp 2025-05-26 23:42:53 +02:00
  • de62585b64 Merge pull request 'nicer-text' (#1060) from nicer-text into staging philipp 2025-05-26 23:42:42 +02:00
  • 09e06017c2 improve text Philipp Hofer 2025-05-26 23:41:08 +02:00
  • 34ade37f2d Merge pull request 'add docs' (#1057) from docs into main philipp 2025-05-22 13:26:01 +02:00
  • ac24be6c5e Merge pull request 'add docs' (#1056) from docs into staging philipp 2025-05-22 13:25:53 +02:00
  • 138c0598e6 add docs Philipp Hofer 2025-05-22 13:25:14 +02:00
  • 5b75ff5d38 Merge pull request 'add planned mod' (#1054) from restructure into main philipp 2025-05-22 13:08:03 +02:00
  • 13976b02d8 Merge pull request 'add planned mod' (#1053) from restructure into staging philipp 2025-05-22 13:07:46 +02:00
  • a42e0b3ed3 add planned mod Philipp Hofer 2025-05-22 13:06:26 +02:00
  • 743359904a Merge pull request '[BUGFIX] add border top reservation' (#1052) from reservation-border into main philipp 2025-05-22 12:43:20 +02:00
  • 3aef4fa971 Merge pull request 'reservation-border' (#1049) from reservation-border into staging philipp 2025-05-22 12:42:54 +02:00
  • f46ddf249a Merge pull request 'slight restructure of trip' (#1051) from restructure into main philipp 2025-05-22 12:41:54 +02:00
  • 29e9911653 Merge pull request 'restructure' (#1050) from restructure into staging philipp 2025-05-22 12:41:49 +02:00
  • bc6244bc03 slight restructure of trip Philipp Hofer 2025-05-22 12:41:01 +02:00
  • 47e3d1b5b3 [BUGFIX] add border top reservation Marie Birner 2025-05-22 12:34:05 +02:00
  • d6b9a2f11b Merge pull request 'board members can delete trips, proper notification + succ message is created' (#1048) from board-can-delete-trips into main philipp 2025-05-21 09:58:20 +02:00
  • eca711e572 Merge pull request 'board members can delete trips, proper notification + succ message is created' (#1047) from board-can-delete-trips into staging philipp 2025-05-21 09:58:14 +02:00
  • 4e04b2b082 board members can delete trips, proper notification + succ message is created Philipp Hofer 2025-05-21 09:56:45 +02:00
  • 73a7abd418 Merge pull request 'allow scheckbuch finances editing via /user/fees' (#1046) from consistent-user-management into main philipp 2025-05-17 16:36:04 +02:00
  • 09aa0fc136 Merge pull request 'allow scheckbuch finances editing via /user/fees' (#1045) from consistent-user-management into staging philipp 2025-05-17 16:35:57 +02:00
  • abd58766d8 allow scheckbuch finances editing via /user/fees Philipp Hofer 2025-05-17 16:34:50 +02:00
  • 58a357fdb5 Merge pull request 'ernst + board got rowingbadge notification on every trip of ernst, bc last 'wanderfahrt' was removed' (#1044) from dont-repeatedly-get-price into main philipp 2025-05-17 16:24:22 +02:00
  • cc9505ca1e Merge pull request 'dont-repeatedly-get-price' (#1043) from dont-repeatedly-get-price into staging philipp 2025-05-17 16:24:00 +02:00
  • 5202060e2f ernst + board got rowingbadge notification on every trip of ernst, bc last 'wanderfahrt' was removed Philipp Hofer 2025-05-17 16:23:24 +02:00
  • 129c90f1aa Merge pull request 'format & lanaguage improv' (#1042) from language-improvement into main philipp 2025-05-17 15:59:58 +02:00
  • 22f70f533a Merge pull request 'language-improvement' (#1041) from language-improvement into staging philipp 2025-05-17 15:59:51 +02:00
  • 64b3e63e15 format & lanaguage improv Philipp Hofer 2025-05-17 15:59:15 +02:00
  • e631ee67b5 Merge pull request 'default duration in cal of trips with type Lange Ausfahrt -> 6 hrs (instead of 3); Fixes #939' (#1039) from longer-long-trips into main philipp 2025-05-17 10:09:09 +02:00
  • 6df029b4a7 Merge pull request 'default duration in cal of trips with type Lange Ausfahrt -> 6 hrs (instead of 3); Fixes #939' (#1040) from longer-long-trips into staging philipp 2025-05-17 10:08:58 +02:00
  • 63edc3d249 default duration in cal of trips with type Lange Ausfahrt -> 6 hrs (instead of 3); Fixes #939 Philipp Hofer 2025-05-17 10:08:07 +02:00
  • 61016f284c Merge pull request 'add nx link' (#1038) from nx-link into main philipp 2025-05-17 09:55:27 +02:00
  • 1d4d59842b Merge pull request 'nx-link' (#1037) from nx-link into staging philipp 2025-05-17 09:55:22 +02:00
  • 18348e68f3 add nx link Philipp Hofer 2025-05-17 09:54:46 +02:00
  • 7730de8ada Merge pull request 'more-activities' (#1036) from more-activities into main philipp 2025-05-17 09:50:08 +02:00