Commit Graph

  • b41457d30e Merge pull request 'nicer label' (#804) from nicer-label into main philipp 2024-11-25 21:02:13 +01:00
  • 766886d857 Merge pull request 'nicer-label' (#803) from nicer-label into staging philipp 2024-11-25 21:01:38 +01:00
  • 4408100e49 nicer label Philipp Hofer 2024-11-25 21:00:25 +01:00
  • 32b8aa0145 Merge pull request 'allow non-cox to create ergo-trips' (#802) from ergo-trips into main philipp 2024-11-25 12:31:57 +01:00
  • 38703321e8 Merge pull request 'ergo-trips' (#801) from ergo-trips into staging philipp 2024-11-25 12:31:50 +01:00
  • 1f0b74554f allow non-cox to create ergo-trips Philipp Hofer 2024-11-25 12:12:36 +01:00
  • 9d3b1d522b Merge pull request 'allow for smaller m' (#800) from trim-ergo into main philipp 2024-11-11 23:12:33 +01:00
  • ec1c717341 Merge pull request 'allow for smaller m' (#799) from trim-ergo into staging philipp 2024-11-11 23:12:23 +01:00
  • 656c0b99ea allow for smaller m Philipp Hofer 2024-11-11 23:11:46 +01:00
  • 85b39d472c Merge pull request 'allow m in dd' (#798) from trim-ergo into main philipp 2024-11-11 23:07:34 +01:00
  • 22bb79bfbd Merge pull request 'allow m in dd' (#797) from trim-ergo into staging philipp 2024-11-11 23:07:28 +01:00
  • 50f410d9fd allow m in dd Philipp Hofer 2024-11-11 23:06:53 +01:00
  • f574ae14db Merge pull request 'trim-ergo' (#796) from trim-ergo into main philipp 2024-11-11 23:00:13 +01:00
  • eba4b77983 Merge pull request 'trim-ergo' (#795) from trim-ergo into staging philipp 2024-11-11 23:00:08 +01:00
  • 5c8966f34c always show full time Philipp Hofer 2024-11-11 22:57:46 +01:00
  • 88c6469154 trim ergo entries Philipp Hofer 2024-11-11 22:45:32 +01:00
  • e33074f540 Merge pull request 'update data' (#794) from formating-ergo into main philipp 2024-11-11 18:03:49 +01:00
  • 83d266b3e0 Merge pull request 'update data' (#793) from formating-ergo into staging philipp 2024-11-11 18:03:43 +01:00
  • 768a96345e update data Philipp Hofer 2024-11-11 17:58:13 +01:00
  • c8cfcd619f Merge pull request 'fix tests' (#792) from formating-ergo into main philipp 2024-11-11 15:27:33 +01:00
  • 980bcff1d9 Merge pull request 'fix tests' (#791) from formating-ergo into staging philipp 2024-11-11 15:27:15 +01:00
  • d7eaa14e55 fix tests Philipp Hofer 2024-11-11 15:26:33 +01:00
  • 8e1b1c1aac Merge pull request 'formating-ergo' (#790) from formating-ergo into main philipp 2024-11-11 13:34:36 +01:00
  • c15ed6e9a9 Merge pull request 'formating-ergo' (#789) from formating-ergo into staging philipp 2024-11-11 13:34:31 +01:00
  • d5e6371b89 craete log if user creates a new event Philipp Hofer 2024-11-11 13:33:23 +01:00
  • eb49a829c6 formatting ergo Philipp Hofer 2024-11-11 10:27:50 +01:00
  • c7b5b7e39d adapt to new domain philipp 2024-10-28 16:13:37 +01:00
  • d76ce744f1 Merge pull request '[TASK] add rudi win svg' (#788) from rudi into main philipp 2024-10-28 15:51:58 +01:00
  • 61ec8bddb8 Merge pull request 'rudi' (#786) from rudi into staging philipp 2024-10-28 15:50:56 +01:00
  • 07e69d7833 [TASK] add rudi win svg Marie Birner 2024-10-28 09:22:24 +01:00
  • 35866c216b Merge pull request 'fix initial selection' (#785) from fix into main philipp 2024-10-28 09:15:37 +01:00
  • c8b60fa518 Merge pull request 'fix' (#784) from fix into staging philipp 2024-10-28 09:15:14 +01:00
  • 7e20120a02 fix initial selection philipp 2024-10-28 09:14:19 +01:00
  • 2c7b8d9393 Merge pull request 'use clusters in user roles' (#783) from use-clusters into main philipp 2024-10-28 08:20:37 +01:00
  • d2cebc7c67 Merge pull request 'use-clusters' (#782) from use-clusters into staging philipp 2024-10-28 08:20:04 +01:00
  • 0c72dc9e4c use clusters in user roles philipp 2024-10-28 08:19:32 +01:00
  • b4ec423b81 Merge pull request 'lint & allow to update 'handgesteuert' status of logbook' (#781) from update-handgesteuert into main philipp 2024-10-26 21:06:34 +02:00
  • 13a372252d Merge pull request 'update-handgesteuert' (#780) from update-handgesteuert into staging philipp 2024-10-26 21:06:27 +02:00
  • fa364d0be9 lint & allow to update 'handgesteuert' status of logbook philipp 2024-10-26 21:05:32 +02:00
  • d0b0888a9b Merge pull request 'inform people of participation; require updating personal data before joining' (#774) from update-ergo into main philipp 2024-10-25 21:00:49 +02:00
  • 4b0460aeee Merge pull request 'update-ergo' (#779) from update-ergo into staging philipp 2024-10-25 20:59:53 +02:00
  • 6d18fe0219 Merge branch 'staging' into update-ergo philipp 2024-10-25 20:59:16 +02:00
  • fbad517b56 Ergo Challenge not Ergo-Challenge. Sth. completely different philipp 2024-10-25 20:57:21 +02:00
  • f405a3ca15 marie magic philipp 2024-10-25 20:54:43 +02:00
  • d9e8f6170c Merge branch 'main' into update-ergo philipp 2024-10-25 20:15:11 +02:00
  • ab52bf4e96 Merge pull request 'steering-user' (#778) from steering-user into main philipp 2024-10-25 20:14:06 +02:00
  • a68c423fdb Merge pull request 'steering-user' (#777) from steering-user into staging philipp 2024-10-25 19:06:12 +02:00
  • 779e1bbfb9 backend adaptations due to cox change role philipp 2024-10-25 18:55:08 +02:00
  • c87baaed07 add new halfprice for racerowing philipp 2024-10-25 18:31:43 +02:00
  • de567eedec switch from cox to steeringuser, which contains both cox + bootsfuehrer philipp 2024-10-25 18:29:50 +02:00
  • 01fdfcae99 Merge pull request 'show second button in winter' (#775) from update-ergo into staging philipp 2024-10-19 22:17:21 +02:00
  • f801606899 show second button in winter philipp 2024-10-19 22:16:28 +02:00
  • 3272833b2d Merge pull request 'update-ergo' (#773) from update-ergo into staging philipp 2024-10-19 22:04:18 +02:00
  • f71c83dc3f lint philipp 2024-10-19 22:03:50 +02:00
  • b9344a42a0 inform people of participation; require updating personal data before joining philipp 2024-10-19 22:02:44 +02:00
  • 4d4c680e59 Merge pull request 'compress uploads for faster deplyments' (#772) from faster-deploy into main philipp 2024-10-14 14:32:59 +02:00
  • f7f2f2ec38 Merge pull request 'compress uploads for faster deplyments' (#771) from faster-deploy into staging philipp 2024-10-14 14:32:54 +02:00
  • 984ffc69e4 compress uploads for faster deplyments philipp 2024-10-14 14:23:01 +02:00
  • 935f0dd1dd Merge pull request 'merged :-)' (#770) from merged into main philipp 2024-10-14 14:22:07 +02:00
  • aa8d9639fe Merge pull request 'merged' (#769) from merged into staging philipp 2024-10-14 08:45:52 +02:00
  • 2da249b57d merged :-) philipp 2024-10-14 08:34:02 +02:00
  • b0123e2b42 Merge pull request 'only allow people with access rights to login via wordpress' (#768) from fix-wordpress-login into main philipp 2024-10-13 15:03:50 +02:00
  • 94af469b33 Merge pull request 'fix-wordpress-login' (#767) from fix-wordpress-login into staging philipp 2024-10-13 15:03:33 +02:00
  • a53c0ede9c only allow people with access rights to login via wordpress philipp 2024-10-13 14:51:11 +02:00
  • 43377fff8e Merge pull request 'fix-seeds' (#764) from fix-seeds into main philipp 2024-10-11 12:45:12 +02:00
  • 84789cf79d Merge pull request 'deplyed' (#763) from fix-seeds into staging philipp 2024-10-11 12:45:03 +02:00
  • eea61ee6ca deplyed philipp 2024-10-11 12:44:30 +02:00
  • a6a143f238 user-role-cluster (#761) philipp 2024-10-11 12:39:23 +02:00
  • bdde326f03 user-role-cluster (#760) philipp 2024-10-11 11:20:58 +02:00
  • 0cc72f17a1 Merge pull request 'docs' (#757) from docs into main philipp 2024-10-08 10:10:43 +02:00
  • aca4fc82e4 Merge pull request 'docs' (#756) from docs into staging philipp 2024-10-08 10:10:38 +02:00
  • 318fe13666 proper headers philipp 2024-10-08 10:09:12 +02:00
  • c2f7583b38 fix indentation philipp 2024-10-08 10:08:06 +02:00
  • 96fd9c8ed6 fix line breaks philipp 2024-10-08 10:07:34 +02:00
  • dd487853bc add docs philipp 2024-10-08 10:06:29 +02:00
  • 48a817e9ca add doc subfolder philipp 2024-10-08 09:36:32 +02:00
  • 17d97a5e25 Merge pull request 'pull' (#750) from ui-improvements into main philipp 2024-09-24 20:13:41 +02:00
  • 10b55387a4 Merge pull request 'update docker image' (#753) from update-docker into main philipp 2024-09-24 20:13:12 +02:00
  • 44ccbea376 Merge pull request 'update docker image' (#752) from update-docker into staging philipp 2024-09-24 20:13:02 +02:00
  • b792088593 Merge pull request 'ui-improvements' (#751) from ui-improvements into staging philipp 2024-09-24 20:12:23 +02:00
  • 461819923d Merge branch 'staging' into ui-improvements philipp 2024-09-24 20:11:56 +02:00
  • b6efe5170b lint code philipp 2024-09-24 20:10:59 +02:00
  • 4581ec4abc [TASK] style schnupperer even more Marie Birner 2024-09-24 20:09:53 +02:00
  • ca8cd4612d add additional role philipp 2024-09-24 20:01:14 +02:00
  • c99686f72f update docker image philipp 2024-09-24 19:45:30 +02:00
  • 2cdfacab53 [BUGFIX] dark mode bg issue Marie Birner 2024-09-24 19:44:33 +02:00
  • 6d3c8bffa3 Merge pull request 'ui-improvements' (#749) from ui-improvements into main philipp 2024-09-24 19:43:46 +02:00
  • cecd5e8106 Merge pull request 'ui-improvements' (#748) from ui-improvements into staging marie 2024-09-19 11:49:43 +02:00
  • 615898ead4 Merge branch 'staging' into ui-improvements marie 2024-09-19 11:29:11 +02:00
  • 2663772651 [TASK] style fees page Marie Birner 2024-09-18 09:58:19 +02:00
  • b7e3c882d8 [TASK] change schnupper ui and hopefully improve it Marie Birner 2024-09-17 13:06:39 +02:00
  • 56f5b6e8db Merge pull request 'inform board if more trips than allowed' (#744) from mail-end-scheckbuch into main philipp 2024-09-12 08:36:20 +02:00
  • 102cc90a23 Merge pull request 'inform board if more trips than allowed' (#743) from mail-end-scheckbuch into staging philipp 2024-09-12 08:36:09 +02:00
  • b429998775 inform board if more trips than allowed philipp 2024-09-12 08:35:10 +02:00
  • 5727c0c9ce Merge pull request 'send scheckbuch people mail after using all trips' (#742) from mail-end-scheckbuch into main philipp 2024-09-11 23:53:08 +02:00
  • ece64868fe Merge pull request 'mail-end-scheckbuch' (#741) from mail-end-scheckbuch into staging philipp 2024-09-11 23:52:58 +02:00
  • 1225aeac94 send scheckbuch people mail after using all trips philipp 2024-09-11 23:52:16 +02:00
  • 8408148ead Merge pull request 'show type of boat' (#740) from art into main philipp 2024-09-11 19:10:46 +02:00
  • d0d7da7996 Merge pull request 'art' (#739) from art into staging philipp 2024-09-11 19:10:40 +02:00
  • 14bfb695d9 show type of boat philipp 2024-09-11 19:10:02 +02:00