This repository has been archived by the owner on Apr 24, 2024. It is now read-only.
Feat(#33)set up static questions #98
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…t' into improove_questions_within_contest # Conflicts: # client/src/api/question.js # client/src/components/AddQuestion.vue # client/src/components/QuestionTab.vue # server/src/entity/Contest.ts # server/src/entity/Question.ts # server/src/modules/Contest/contest.service.ts # server/src/modules/Question/dto/question.dto.ts
…-static-questions # Conflicts: # server/src/modules/Question/dto/question.dto.ts # server/src/modules/Question/question.controller.ts # server/src/modules/Question/question.service.spec.ts # server/src/modules/Question/question.service.ts
some nasty conflicts resolutions
nazar-rudenko
changed the title
This comment has been minimized.
This comment has been minimized.
# Conflicts: # server/src/entity/Question.ts # server/src/modules/Question/question.service.spec.ts
…t' into improove_questions_within_contest
nazar-rudenko
changed the title
nazar-rudenko
requested review from
kovnick and
alexZogich
and removed request for
kovnick
nazar-rudenko
commented
Apr 12, 2019
| @@ -75,7 +78,6 @@ | |||
| "^.+\\.(t|j)s$": "ts-jest" | |||
| }, | |||
| "coverageDirectory": "../coverage", | |||
| "collectCoverage": true, | |||
There was a problem hiding this comment.
fixed tests
…-static-questions
…' into feat(#33)set-up-static-questions
kovnick
reviewed
Apr 15, 2019
kovnick
reviewed
Apr 15, 2019
proceeded Nikita's feedback
kovnick
reviewed
Apr 15, 2019
|
@MelnychenkoIvan Please confirm that question.service.ts with ask() and reply() methods ok for your team functionality |
proceeded Nikita's feedback
kovnick
approved these changes
Apr 16, 2019
fixed migration
nazar-rudenko
force-pushed
the
feat(#33)set-up-static-questions
branch
from
4956760
to
b0b248b
Compare
MelnychenkoIvan
approved these changes
Apr 16, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Checklist
PR meets the following requirements:
PR Type
PR introduces the following changes:
Actual/New behavior
Issue Number: N/A
Other information