-
- Downloads
Merge branch 'dev' into 'master'
Merge DEV to MASTER See merge request web-et-numerique/llle_project/ecolyo!39
Showing
- .github/ISSUE_TEMPLATE 0 additions, 0 deletions.github/ISSUE_TEMPLATE
- .github/PULL_REQUEST_TEMPLATE 0 additions, 20 deletions.github/PULL_REQUEST_TEMPLATE
- .gitignore 1 addition, 0 deletions.gitignore
- .gitlab/issue_templates/Bug.md 50 additions, 0 deletions.gitlab/issue_templates/Bug.md
- config.json 3 additions, 6 deletionsconfig.json
- docker/cozy-app-dev-with-app.sh 12 additions, 12 deletionsdocker/cozy-app-dev-with-app.sh
- manifest.webapp 1 addition, 1 deletionmanifest.webapp
- package.json 1 addition, 1 deletionpackage.json
- src/assets/icons/ico/legal.svg 5 additions, 0 deletionssrc/assets/icons/ico/legal.svg
- src/assets/icons/visu/challenge/star.svg 12 additions, 0 deletionssrc/assets/icons/visu/challenge/star.svg
- src/assets/icons/visu/ecogesture/0078.svg 29 additions, 0 deletionssrc/assets/icons/visu/ecogesture/0078.svg
- src/assets/png/badges/CHA00000003-0.png 0 additions, 0 deletionssrc/assets/png/badges/CHA00000003-0.png
- src/assets/png/badges/CHA00000003-1.png 0 additions, 0 deletionssrc/assets/png/badges/CHA00000003-1.png
- src/components/CommonKit/Card/StyledCard.tsx 1 addition, 1 deletionsrc/components/CommonKit/Card/StyledCard.tsx
- src/components/ContainerComponents/FluidChartContainer/FluidChartContainer.tsx 2 additions, 2 deletions...nerComponents/FluidChartContainer/FluidChartContainer.tsx
- src/components/ContainerComponents/Header/Header.tsx 14 additions, 2 deletionssrc/components/ContainerComponents/Header/Header.tsx
- src/components/ContainerComponents/LegalContainer/LegalContainer.tsx 43 additions, 0 deletions...nts/ContainerComponents/LegalContainer/LegalContainer.tsx
- src/components/ContainerComponents/ViewContainer/AvailableChallengeDetailsViewContainer.tsx 1 addition, 1 deletion.../ViewContainer/AvailableChallengeDetailsViewContainer.tsx
- src/components/ContainerComponents/ViewContainer/LegalViewContainer.tsx 26 additions, 0 deletions.../ContainerComponents/ViewContainer/LegalViewContainer.tsx
- src/components/ContainerComponents/ViewContainer/OngoingChallengeDetailsViewContainer.tsx 20 additions, 13 deletions...ts/ViewContainer/OngoingChallengeDetailsViewContainer.tsx
Loading