Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Ecolyo
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

7c5ab6ed

Commit 7c5ab6ed authored 4 years ago by Guilhem CARRON

Downloads
- Plain Diff

Merge branch 'dev' of...

Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into features/US337-review-quiz

parents 0637086a 2d57e0ec

Branches

Tags

1 merge request!180Features/us337 review quiz

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/components/Challenge/ChallengeCardOnGoing.tsx 25 additions, 10 deletions

src/components/Challenge/ChallengeCardOnGoing.tsx
src/components/Duel/DuelUnlocked.tsx 10 additions, 25 deletions

src/components/Duel/DuelUnlocked.tsx
src/components/Feedback/FeedbackModal.spec.tsx 0 additions, 5 deletions

src/components/Feedback/FeedbackModal.spec.tsx
src/components/Feedback/FeedbackModal.tsx 1 addition, 18 deletions

src/components/Feedback/FeedbackModal.tsx
src/components/Feedback/__snapshots__/FeedbackModal.spec.tsx.snap 0 additions, 15 deletions

...onents/Feedback/__snapshots__/FeedbackModal.spec.tsx.snap
src/components/Feedback/feedbackModal.scss 1 addition, 0 deletions

src/components/Feedback/feedbackModal.scss
src/locales/fr.json 0 additions, 2 deletions

src/locales/fr.json
src/services/challenge.service.spec.ts 6 additions, 5 deletions

src/services/challenge.service.spec.ts
src/services/duel.service.spec.ts 26 additions, 1 deletion

src/services/duel.service.spec.ts
src/services/duel.service.ts 22 additions, 11 deletions

src/services/duel.service.ts

with 91 additions and 92 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment