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

New Issue

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

Stone_Red commented

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

📋 Pull Request Information

Original PR: https://github.com/detleph/server/pull/84
Author: @Flexla54
Created: 6/9/2022
Status: ✅ Merged
Merged: 6/10/2022
Merged by: @Flexla54

Base: main ← Head: dev

📝 Commits (10+)

87f5fa2 Add various participant and role controllers
718c040 Fix routes, add getRole controller
3a995c6 Add route to get participant for role
68cf5bf Address some comments and fix issues
474b3f8 Rewrite parts of the requestTokenEmailController
0fea7ed fixed review suggestions
418a26b Adding RoleSchema Update/Delete
44a98a8 [create-pull-request] push formatted files
f92b004 patches for update
ab78afd Merge pull request #85 from detleph/main

📊 Changes

14 files changed (+208 additions, -37 deletions)

View changed files

📝 docker-compose.yml (+6 -0)
📝 prisma/schema.prisma (+1 -1)
📝 src/Controllers/participant.controller.ts (+73 -5)
📝 src/Controllers/role.controller.ts (+32 -7)
📝 src/Controllers/role_schema.controller.ts (+22 -2)
📝 src/Controllers/team.controller.ts (+1 -1)
📝 src/Controllers/user_auth.controller.ts (+10 -9)
📝 src/Middleware/auth/teamleaderAuth.ts (+10 -1)
📝 src/Routes/participant.routes.ts (+32 -4)
📝 src/Routes/role.routes.ts (+9 -2)
📝 src/Routes/role_schema.routes.ts (+7 -1)
📝 src/Routes/user_auth.routes.ts (+3 -2)
📝 src/Tests/events.test.ts (+1 -1)
📝 src/Tests/mail.test.ts (+1 -1)

📄 Description

No description provided

_{🔄 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/84 **Author:** [@Flexla54](https://github.com/Flexla54) **Created:** 6/9/2022 **Status:** ✅ Merged **Merged:** 6/10/2022 **Merged by:** [@Flexla54](https://github.com/Flexla54) **Base:** `main` ← **Head:** `dev` --- ### 📝 Commits (10+) - [`87f5fa2`](https://github.com/detleph/server/commit/87f5fa2e9189b8f750f02f459c49c627e8148fca) Add various participant and role controllers - [`718c040`](https://github.com/detleph/server/commit/718c040517aef813908cb391f935386d04f0a96d) Fix routes, add getRole controller - [`3a995c6`](https://github.com/detleph/server/commit/3a995c6b03a9fd74db2dbc450c6d0e058e9cc89e) Add route to get participant for role - [`68cf5bf`](https://github.com/detleph/server/commit/68cf5bf573c408337de88bedea4ad834fc516367) Address some comments and fix issues - [`474b3f8`](https://github.com/detleph/server/commit/474b3f81857ff27717cf97c63e16d0e075f16e3c) Rewrite parts of the requestTokenEmailController - [`0fea7ed`](https://github.com/detleph/server/commit/0fea7edb25ebed7a800f334f66e1104d49492005) fixed review suggestions - [`418a26b`](https://github.com/detleph/server/commit/418a26b3dd3c7ce2ff30075c7c8eab677957093a) Adding RoleSchema Update/Delete - [`44a98a8`](https://github.com/detleph/server/commit/44a98a8312b44a86ba8a7d0b60bd1cb51657b584) [create-pull-request] push formatted files - [`f92b004`](https://github.com/detleph/server/commit/f92b004fbe5a478d05744b7a0d89d8dc9f88a695) patches for update - [`ab78afd`](https://github.com/detleph/server/commit/ab78afdc7b7b4b2c68257fad63e823baaab91939) Merge pull request #85 from detleph/main ### 📊 Changes **14 files changed** (+208 additions, -37 deletions) <details> <summary>View changed files</summary> 📝 `docker-compose.yml` (+6 -0) 📝 `prisma/schema.prisma` (+1 -1) 📝 `src/Controllers/participant.controller.ts` (+73 -5) 📝 `src/Controllers/role.controller.ts` (+32 -7) 📝 `src/Controllers/role_schema.controller.ts` (+22 -2) 📝 `src/Controllers/team.controller.ts` (+1 -1) 📝 `src/Controllers/user_auth.controller.ts` (+10 -9) 📝 `src/Middleware/auth/teamleaderAuth.ts` (+10 -1) 📝 `src/Routes/participant.routes.ts` (+32 -4) 📝 `src/Routes/role.routes.ts` (+9 -2) 📝 `src/Routes/role_schema.routes.ts` (+7 -1) 📝 `src/Routes/user_auth.routes.ts` (+3 -2) 📝 `src/Tests/events.test.ts` (+1 -1) 📝 `src/Tests/mail.test.ts` (+1 -1) </details> ### 📄 Description _No description provided_ --- <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:06 +02:00

Stone_Red closed this issue

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

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: detleph/server#93