-
- Downloads
Merge branch 'dev' of...
Merge branch 'dev' of https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system into 126-competition-login
No related branches found
No related tags found
This commit is part of merge request !93. Comments created here will be created in the context of that merge request.
Showing
- .vscode/settings.json 2 additions, 1 deletion.vscode/settings.json
- client/src/actions/types.ts 4 additions, 0 deletionsclient/src/actions/types.ts
- client/src/enum/ComponentTypes.ts 1 addition, 1 deletionclient/src/enum/ComponentTypes.ts
- client/src/interfaces/ApiModels.ts 1 addition, 0 deletionsclient/src/interfaces/ApiModels.ts
- client/src/interfaces/ApiRichModels.ts 2 additions, 1 deletionclient/src/interfaces/ApiRichModels.ts
- client/src/pages/admin/AdminPage.test.tsx 1 addition, 1 deletionclient/src/pages/admin/AdminPage.test.tsx
- client/src/pages/admin/competitions/CompetitionManager.test.tsx 1 addition, 1 deletion.../src/pages/admin/competitions/CompetitionManager.test.tsx
- client/src/pages/presentationEditor/components/Alternatives.tsx 136 additions, 0 deletions.../src/pages/presentationEditor/components/Alternatives.tsx
- client/src/pages/presentationEditor/components/CompetitionSettings.test.tsx 0 additions, 10 deletions...resentationEditor/components/CompetitionSettings.test.tsx
- client/src/pages/presentationEditor/components/ImageComponentDisplay.test.tsx 7 additions, 1 deletion...sentationEditor/components/ImageComponentDisplay.test.tsx
- client/src/pages/presentationEditor/components/ImageComponentDisplay.tsx 10 additions, 33 deletions...s/presentationEditor/components/ImageComponentDisplay.tsx
- client/src/pages/presentationEditor/components/Images.tsx 137 additions, 0 deletionsclient/src/pages/presentationEditor/components/Images.tsx
- client/src/pages/presentationEditor/components/RndComponent.tsx 11 additions, 2 deletions.../src/pages/presentationEditor/components/RndComponent.tsx
- client/src/pages/presentationEditor/components/SettingsPanel.test.tsx 2 additions, 1 deletion...ages/presentationEditor/components/SettingsPanel.test.tsx
- client/src/pages/presentationEditor/components/SlideSettings.tsx 30 additions, 426 deletions...src/pages/presentationEditor/components/SlideSettings.tsx
- client/src/pages/presentationEditor/components/SlideType.tsx 137 additions, 0 deletionsclient/src/pages/presentationEditor/components/SlideType.tsx
- client/src/pages/presentationEditor/components/TextComponentEdit.tsx 5 additions, 3 deletions...pages/presentationEditor/components/TextComponentEdit.tsx
- client/src/pages/presentationEditor/components/Texts.tsx 61 additions, 0 deletionsclient/src/pages/presentationEditor/components/Texts.tsx
- client/src/pages/presentationEditor/components/Timer.tsx 53 additions, 0 deletionsclient/src/pages/presentationEditor/components/Timer.tsx
- client/src/pages/presentationEditor/components/styled.tsx 87 additions, 1 deletionclient/src/pages/presentationEditor/components/styled.tsx
Loading
Please register or sign in to comment