[PR #56] [MERGED] Merge feature-endpoints into feature-roles #85

New Issue

2026-09-04T00:22:03+02:00

Stone_Red commented

2026-09-04 00:22:03 +02:00

📋 Pull Request Information

Original PR: https://github.com/detleph/server/pull/56
Author: @stephan418
Created: 5/30/2022
Status: ✅ Merged
Merged: 6/3/2022
Merged by: @Flexla54

Base: feature-roles ← Head: feature-endpoints

📝 Commits (10+)

4555d46 modified event responses and updated discipline briefDescription + fullDescription
4e77d3c Event zod add pid/id; rm comented MediaRouter
cc57c51 Added updateDiscipline
4f94bf0 created Role controller/routes
1cb345c de-duplicated (un-)linkMedia
ba1d09d media bugfixes
95784a2 Merge branch 'feature-roles' into feature-endpoints
5696952 patching complications after merging and review suggestions
0f0da06 patched issues found during testing
b3a1ec5 small fixes

📊 Changes

21 files changed (+330 additions, -491 deletions)

View changed files

📝 prisma/schema.prisma (+8 -6)
📝 src/Controllers/discipline.controller.ts (+16 -64)
📝 src/Controllers/event.controller.ts (+59 -136)
📝 src/Controllers/group.controllers.ts (+1 -1)
📝 src/Controllers/media.controller.ts (+69 -4)
📝 src/Controllers/organisation.controller.ts (+6 -9)
📝 src/Controllers/participant.controller.ts (+18 -29)
📝 src/Controllers/role.controller.ts (+24 -65)
📝 src/Controllers/role_schema.controller.ts (+11 -89)
📝 src/Controllers/team.controller.ts (+46 -26)
📝 src/Controllers/user_auth.controller.ts (+4 -2)
📝 src/Middleware/error/defaultRoutes.ts (+1 -1)
📝 src/Routes/discipline.routes.ts (+0 -14)
📝 src/Routes/event.routes.ts (+0 -10)
📝 src/Routes/media.routes.ts (+25 -1)
📝 src/Routes/participant.routes.ts (+10 -15)
📝 src/Routes/role.routes.ts (+13 -2)
📝 src/Routes/role_schema.routes.ts (+0 -10)
📝 src/Routes/team.routes.ts (+10 -2)
📝 src/app.ts (+8 -5)

...and 1 more files

📄 Description

Adds multiple features to prepare for release

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/detleph/server/pull/56 **Author:** [@stephan418](https://github.com/stephan418) **Created:** 5/30/2022 **Status:** ✅ Merged **Merged:** 6/3/2022 **Merged by:** [@Flexla54](https://github.com/Flexla54) **Base:** `feature-roles` ← **Head:** `feature-endpoints` --- ### 📝 Commits (10+) - [`4555d46`](https://github.com/detleph/server/commit/4555d46902a05bf355befb8cbfedfbbc2276ffaf) modified event responses and updated discipline briefDescription + fullDescription - [`4e77d3c`](https://github.com/detleph/server/commit/4e77d3c66dafa09b90ea47a2eced981831ae2795) Event zod add pid/id; rm comented MediaRouter - [`cc57c51`](https://github.com/detleph/server/commit/cc57c513899684fb97178eb6c2453084b432f09b) Added updateDiscipline - [`4f94bf0`](https://github.com/detleph/server/commit/4f94bf074c8cc5b21e3c2bfd9d936e12535ddf84) created Role controller/routes - [`1cb345c`](https://github.com/detleph/server/commit/1cb345c316a3a5ed18cdcf8892cdfe2e600aec2a) de-duplicated (un-)linkMedia - [`ba1d09d`](https://github.com/detleph/server/commit/ba1d09d1813cfa4dccf63d715ac4aa70f59c5d78) media bugfixes - [`95784a2`](https://github.com/detleph/server/commit/95784a2a9faec7310a45c6c6c6a096c6c34c602c) Merge branch 'feature-roles' into feature-endpoints - [`5696952`](https://github.com/detleph/server/commit/569695245fd787079e1d67a771a68b68e2cfa0ee) patching complications after merging and review suggestions - [`0f0da06`](https://github.com/detleph/server/commit/0f0da062c68499bddd95e0859ba126624ea7f1df) patched issues found during testing - [`b3a1ec5`](https://github.com/detleph/server/commit/b3a1ec5fa531624c827835a6b460301bba8058f1) small fixes ### 📊 Changes **21 files changed** (+330 additions, -491 deletions) <details> <summary>View changed files</summary> 📝 `prisma/schema.prisma` (+8 -6) 📝 `src/Controllers/discipline.controller.ts` (+16 -64) 📝 `src/Controllers/event.controller.ts` (+59 -136) 📝 `src/Controllers/group.controllers.ts` (+1 -1) 📝 `src/Controllers/media.controller.ts` (+69 -4) 📝 `src/Controllers/organisation.controller.ts` (+6 -9) 📝 `src/Controllers/participant.controller.ts` (+18 -29) 📝 `src/Controllers/role.controller.ts` (+24 -65) 📝 `src/Controllers/role_schema.controller.ts` (+11 -89) 📝 `src/Controllers/team.controller.ts` (+46 -26) 📝 `src/Controllers/user_auth.controller.ts` (+4 -2) 📝 `src/Middleware/error/defaultRoutes.ts` (+1 -1) 📝 `src/Routes/discipline.routes.ts` (+0 -14) 📝 `src/Routes/event.routes.ts` (+0 -10) 📝 `src/Routes/media.routes.ts` (+25 -1) 📝 `src/Routes/participant.routes.ts` (+10 -15) 📝 `src/Routes/role.routes.ts` (+13 -2) 📝 `src/Routes/role_schema.routes.ts` (+0 -10) 📝 `src/Routes/team.routes.ts` (+10 -2) 📝 `src/app.ts` (+8 -5) _...and 1 more files_ </details> ### 📄 Description Adds multiple features to prepare for release --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

Stone_Red added the pull-request label 2026-09-04 00:22:03 +02:00

Stone_Red closed this issue

2026-09-04 00:22:03 +02:00

Stone_Red referenced this issue

2026-09-04 00:22:06 +02:00

[PR #84] [MERGED] Merging Dev into Main #93

Stone_Red referenced this issue

2026-09-04 00:22:06 +02:00

[PR #85] [MERGED] Merge main into dev before rebasing #95

Sign in to join this conversation.