Original PR: https://github.com/detleph/server/pull/52 Author: @Stefan-5422 Created: 5/19/2022 Status: ✅ Merged Merged: 5/19/2022 Merged by: @Stefan-5422
Base: main ← Head: prepare-release
main
prepare-release
ea6b2d7
e816e0b
5c0bc20
30ffd09
124773c
d596670
5223c50
eff8dd0
1d87860
a0d0336
48 files changed (+5548 additions, -183 deletions)
➕ .dockerignore (+2 -0) 📝 .github/workflows/prettier-check.yml (+2 -2) 📝 .gitignore (+6 -0) ➕ .gitmodules (+3 -0) ➕ Dockerfile (+31 -0) 📝 README.md (+5 -0) ➕ dev.sh (+57 -0) ➕ docker-compose.yml (+37 -0) 📝 package-lock.json (+3160 -61) 📝 package.json (+25 -6) 📝 prisma/schema.prisma (+139 -100) ➕ resources/email/templates (+1 -0) ➕ scripts/dkim.sh (+33 -0) ➕ scripts/docker-entrypoint.dev.sh (+13 -0) ➕ scripts/docker-entrypoint.sh (+11 -0) ➕ scripts/start.sh (+3 -0) ➕ src/Controllers/admin.controller.ts (+212 -0) ➕ src/Controllers/admin_auth.controller.ts (+79 -0) ➕ src/Controllers/common.ts (+153 -0) ➕ src/Controllers/discipline.controller.ts (+189 -0)
.dockerignore
.github/workflows/prettier-check.yml
.gitignore
.gitmodules
Dockerfile
README.md
dev.sh
docker-compose.yml
package-lock.json
package.json
prisma/schema.prisma
resources/email/templates
scripts/dkim.sh
scripts/docker-entrypoint.dev.sh
scripts/docker-entrypoint.sh
scripts/start.sh
src/Controllers/admin.controller.ts
src/Controllers/admin_auth.controller.ts
src/Controllers/common.ts
src/Controllers/discipline.controller.ts
...and 28 more files
Bring main brach up to date to release
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.
No dependencies set.
The note is not visible to the blocked user.
📋 Pull Request Information
Original PR: https://github.com/detleph/server/pull/52
Author: @Stefan-5422
Created: 5/19/2022
Status: ✅ Merged
Merged: 5/19/2022
Merged by: @Stefan-5422
Base:
main← Head:prepare-release📝 Commits (10+)
ea6b2d7Chaned Prisma shema due to Issue: #8e816e0bCheck formatting on the dev branch5c0bc20Added docker-compose30ffd09Normalize schema124773cAdd leader fieldsd596670Add mail functionality into the development branch (#12)5223c50update campaign, participants, groupeff8dd0Add the redis server to docker-compose.yml1d87860Adding LinkObject; adjust detailsa0d0336Adding enum (Gender, AdminLevel)📊 Changes
48 files changed (+5548 additions, -183 deletions)
View changed files
➕
.dockerignore(+2 -0)📝
.github/workflows/prettier-check.yml(+2 -2)📝
.gitignore(+6 -0)➕
.gitmodules(+3 -0)➕
Dockerfile(+31 -0)📝
README.md(+5 -0)➕
dev.sh(+57 -0)➕
docker-compose.yml(+37 -0)📝
package-lock.json(+3160 -61)📝
package.json(+25 -6)📝
prisma/schema.prisma(+139 -100)➕
resources/email/templates(+1 -0)➕
scripts/dkim.sh(+33 -0)➕
scripts/docker-entrypoint.dev.sh(+13 -0)➕
scripts/docker-entrypoint.sh(+11 -0)➕
scripts/start.sh(+3 -0)➕
src/Controllers/admin.controller.ts(+212 -0)➕
src/Controllers/admin_auth.controller.ts(+79 -0)➕
src/Controllers/common.ts(+153 -0)➕
src/Controllers/discipline.controller.ts(+189 -0)...and 28 more files
📄 Description
Bring main brach up to date to release
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.