Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 16 Pull requests Projects Releases 34 Packages Wiki Activity Actions

Merge branch 'main' into #3-calendar

Browse source 
# Conflicts:
#	package-lock.json
#	src/data-source.ts
#	src/routes/admin/index.ts
#	src/type/permissionTypes.ts
This commit is contained in:
Julian Krauser 2024-11-07 11:09:52 +01:00
commit 98eb870385
48 changed files with 2672 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/data-source.ts
View file

@ -29,6 +29,13 @@ import { memberQualifications } from "./entity/memberQualifications";
import { membership } from "./entity/membership";
import { Memberdata1726301836849 } from "./migrations/1726301836849-memberdata";
import { CommunicationFields1727439800630 } from "./migrations/1727439800630-communicationFields";
import { protocol } from "./entity/protocol";
import { protocolAgenda } from "./entity/protocolAgenda";
import { protocolDecision } from "./entity/protocolDecision";
import { protocolPresence } from "./entity/protocolPresence";
import { protocolVoting } from "./entity/protocolVoting";
import { protocolPrintout } from "./entity/protocolPrintout";
import { Protocol1729347911107 } from "./migrations/1729347911107-protocol";
import { calendar } from "./entity/calendar";
import { calendarType } from "./entity/calendarType";
import { Calendar1729947763295 } from "./migrations/1729947763295-calendar";
@ -61,6 +68,12 @@ const dataSource = new DataSource({
memberExecutivePositions,
memberQualifications,
membership,
protocol,
protocolAgenda,
protocolDecision,
protocolPresence,
protocolVoting,
protocolPrintout,
calendar,
calendarType,
],
@ -73,6 +86,7 @@ const dataSource = new DataSource({
MemberBaseData1725435669492,
Memberdata1726301836849,
CommunicationFields1727439800630,
Protocol1729347911107,
Calendar1729947763295,
],
migrationsRun: true,