-
- Downloads
Merge branch 'dev' of...
Merge branch 'dev' of https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system into 187-disable-timer-when-info-slide
Showing
- client/src/actions/presentation.ts 5 additions, 0 deletionsclient/src/actions/presentation.ts
- client/src/actions/types.ts 1 addition, 0 deletionsclient/src/actions/types.ts
- client/src/interfaces/ApiModels.ts 8 additions, 2 deletionsclient/src/interfaces/ApiModels.ts
- client/src/interfaces/ApiRichModels.ts 3 additions, 3 deletionsclient/src/interfaces/ApiRichModels.ts
- client/src/pages/presentationEditor/PresentationEditorPage.tsx 1 addition, 1 deletion...t/src/pages/presentationEditor/PresentationEditorPage.tsx
- client/src/pages/presentationEditor/components/answerComponents/AnswerMultiple.tsx 27 additions, 39 deletions...tionEditor/components/answerComponents/AnswerMultiple.tsx
- client/src/pages/presentationEditor/components/answerComponents/AnswerSingle.tsx 24 additions, 53 deletions...tationEditor/components/answerComponents/AnswerSingle.tsx
- client/src/pages/presentationEditor/components/answerComponents/AnswerText.tsx 22 additions, 27 deletions...entationEditor/components/answerComponents/AnswerText.tsx
- client/src/pages/views/AudienceViewPage.tsx 4 additions, 0 deletionsclient/src/pages/views/AudienceViewPage.tsx
- client/src/pages/views/OperatorViewPage.tsx 48 additions, 84 deletionsclient/src/pages/views/OperatorViewPage.tsx
- client/src/pages/views/TeamViewPage.tsx 1 addition, 2 deletionsclient/src/pages/views/TeamViewPage.tsx
- client/src/pages/views/components/JudgeScoreDisplay.tsx 48 additions, 12 deletionsclient/src/pages/views/components/JudgeScoreDisplay.tsx
- client/src/pages/views/components/Scoreboard.tsx 69 additions, 0 deletionsclient/src/pages/views/components/Scoreboard.tsx
- client/src/pages/views/components/Timer.tsx 0 additions, 13 deletionsclient/src/pages/views/components/Timer.tsx
- client/src/pages/views/components/styled.tsx 1 addition, 0 deletionsclient/src/pages/views/components/styled.tsx
- client/src/pages/views/styled.tsx 20 additions, 13 deletionsclient/src/pages/views/styled.tsx
- client/src/reducers/presentationReducer.test.ts 3 additions, 0 deletionsclient/src/reducers/presentationReducer.test.ts
- client/src/reducers/presentationReducer.ts 7 additions, 0 deletionsclient/src/reducers/presentationReducer.ts
- client/src/sockets.ts 5 additions, 6 deletionsclient/src/sockets.ts
- server/app/apis/answers.py 66 additions, 32 deletionsserver/app/apis/answers.py
Loading
Please register or sign in to comment