Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

1fe5b58f

Commit 1fe5b58f authored 4 years ago by Yoan VALLET

Downloads
- Plain Diff

Merge branch 'dev' into 'master'

Merge from Dev - version 0.1.0

See merge request web-et-numerique/llle_project/ecolyo!5

parents 9d528b2c 801e37e8

1 merge request!5Merge from Dev - version 0.1.0

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/assets/icons/tabbar/parametre/off.svg 3 additions, 1 deletion

src/assets/icons/tabbar/parametre/off.svg
src/assets/icons/tabbar/parametre/on.svg 1 addition, 1 deletion

src/assets/icons/tabbar/parametre/on.svg
src/components/ContainerComponents/ViewContainer/SingleFluidViewContainer.tsx 0 additions, 2 deletions

...inerComponents/ViewContainer/SingleFluidViewContainer.tsx
src/db/challengeTypeData.json 53 additions, 15 deletions

src/db/challengeTypeData.json
src/db/ecogestureData.json 76 additions, 38 deletions

src/db/ecogestureData.json
src/locales/en.json 2 additions, 2 deletions

src/locales/en.json
src/services/challengeDataMapperService.ts 10 additions, 3 deletions

src/services/challengeDataMapperService.ts
src/services/dataChallengeContracts.ts 3 additions, 0 deletions

src/services/dataChallengeContracts.ts
src/styles/components/_challenges.scss 1 addition, 1 deletion

src/styles/components/_challenges.scss

with 149 additions and 63 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