-
- Downloads
Merge branch 'dev' of...
Merge branch 'dev' of https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system into 86-fix-login-button
No related branches found
No related tags found
Checking pipeline status
This commit is part of merge request !72. Comments created here will be created in the context of that merge request.
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- client/package-lock.json 2 additions, 1 deletionclient/package-lock.json
- client/src/Main.tsx 7 additions, 1 deletionclient/src/Main.tsx
- client/src/actions/presentation.ts 1 addition, 1 deletionclient/src/actions/presentation.ts
- client/src/interfaces/ApiModels.ts 10 additions, 0 deletionsclient/src/interfaces/ApiModels.ts
- client/src/interfaces/ApiRichModels.ts 1 addition, 2 deletionsclient/src/interfaces/ApiRichModels.ts
- client/src/interfaces/Slide.ts 0 additions, 7 deletionsclient/src/interfaces/Slide.ts
- client/src/interfaces/Team.ts 0 additions, 4 deletionsclient/src/interfaces/Team.ts
- client/src/pages/admin/AdminPage.tsx 6 additions, 3 deletionsclient/src/pages/admin/AdminPage.tsx
- client/src/pages/admin/competitions/AddCompetition.tsx 2 additions, 1 deletionclient/src/pages/admin/competitions/AddCompetition.tsx
- client/src/pages/admin/competitions/CompetitionManager.tsx 3 additions, 2 deletionsclient/src/pages/admin/competitions/CompetitionManager.tsx
- client/src/pages/presentationEditor/PresentationEditorPage.tsx 19 additions, 3 deletions...t/src/pages/presentationEditor/PresentationEditorPage.tsx
- client/src/pages/presentationEditor/components/CompetitionSettings.tsx 0 additions, 1 deletion...ges/presentationEditor/components/CompetitionSettings.tsx
- client/src/pages/presentationEditor/styled.tsx 7 additions, 0 deletionsclient/src/pages/presentationEditor/styled.tsx
- client/src/reducers/editorReducer.ts 3 additions, 0 deletionsclient/src/reducers/editorReducer.ts
- client/src/reducers/presentationReducer.ts 1 addition, 2 deletionsclient/src/reducers/presentationReducer.ts
- client/src/reducers/userReducer.ts 2 additions, 3 deletionsclient/src/reducers/userReducer.ts
- server/app/__init__.py 1 addition, 1 deletionserver/app/__init__.py
- server/app/apis/__init__.py 22 additions, 9 deletionsserver/app/apis/__init__.py
- server/app/apis/auth.py 14 additions, 15 deletionsserver/app/apis/auth.py
Loading
Please register or sign in to comment