-
- Downloads
Merge branch 'dev' of...
Merge branch 'dev' of https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system into 137-show-competition-codes
No related branches found
No related tags found
Checking pipeline status
This commit is part of merge request !112. Comments created here will be created in the context of that merge request.
Showing
- client/src/Main.tsx 5 additions, 5 deletionsclient/src/Main.tsx
- client/src/actions/editor.ts 13 additions, 1 deletionclient/src/actions/editor.ts
- client/src/actions/presentation.test.ts 2 additions, 13 deletionsclient/src/actions/presentation.test.ts
- client/src/actions/presentation.ts 5 additions, 17 deletionsclient/src/actions/presentation.ts
- client/src/actions/types.ts 1 addition, 1 deletionclient/src/actions/types.ts
- client/src/interfaces/ApiModels.ts 7 additions, 12 deletionsclient/src/interfaces/ApiModels.ts
- client/src/interfaces/ApiRichModels.ts 2 additions, 1 deletionclient/src/interfaces/ApiRichModels.ts
- client/src/pages/admin/competitions/CompetitionManager.tsx 3 additions, 3 deletionsclient/src/pages/admin/competitions/CompetitionManager.tsx
- client/src/pages/presentationEditor/PresentationEditorPage.test.tsx 11 additions, 0 deletions.../pages/presentationEditor/PresentationEditorPage.test.tsx
- client/src/pages/presentationEditor/PresentationEditorPage.tsx 74 additions, 135 deletions...t/src/pages/presentationEditor/PresentationEditorPage.tsx
- client/src/pages/presentationEditor/components/BackgroundImageSelect.tsx 126 additions, 0 deletions...s/presentationEditor/components/BackgroundImageSelect.tsx
- client/src/pages/presentationEditor/components/CompetitionSettings.tsx 44 additions, 154 deletions...ges/presentationEditor/components/CompetitionSettings.tsx
- client/src/pages/presentationEditor/components/ImageComponentDisplay.test.tsx 9 additions, 1 deletion...sentationEditor/components/ImageComponentDisplay.test.tsx
- client/src/pages/presentationEditor/components/ImageComponentDisplay.tsx 1 addition, 1 deletion...s/presentationEditor/components/ImageComponentDisplay.tsx
- client/src/pages/presentationEditor/components/RndComponent.tsx 13 additions, 24 deletions.../src/pages/presentationEditor/components/RndComponent.tsx
- client/src/pages/presentationEditor/components/SlideDisplay.tsx 96 additions, 0 deletions.../src/pages/presentationEditor/components/SlideDisplay.tsx
- client/src/pages/presentationEditor/components/SlideSettings.tsx 36 additions, 26 deletions...src/pages/presentationEditor/components/SlideSettings.tsx
- client/src/pages/presentationEditor/components/Teams.tsx 100 additions, 0 deletionsclient/src/pages/presentationEditor/components/Teams.tsx
- client/src/pages/presentationEditor/components/TextComponentDisplay.tsx 19 additions, 0 deletions...es/presentationEditor/components/TextComponentDisplay.tsx
- client/src/pages/presentationEditor/components/TextComponentEdit.tsx 18 additions, 10 deletions...pages/presentationEditor/components/TextComponentEdit.tsx
Loading
Please register or sign in to comment