Merge branch 'dev' of...
Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into features/Handle-OAuth-konnector
No related branches found
No related tags found
Showing
- docker/cozy-app-dev-with-app.sh 30 additions, 35 deletionsdocker/cozy-app-dev-with-app.sh
- package.json 0 additions, 1 deletionpackage.json
- src/assets/icons/tabbar/parametre/off.svg 6 additions, 3 deletionssrc/assets/icons/tabbar/parametre/off.svg
- src/assets/icons/tabbar/parametre/on.svg 6 additions, 1 deletionsrc/assets/icons/tabbar/parametre/on.svg
- src/components/ContainerComponents/ViewContainer/AvailableChallengeDetailsViewContainer.tsx 15 additions, 39 deletions.../ViewContainer/AvailableChallengeDetailsViewContainer.tsx
- src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx 23 additions, 8 deletions...s/ViewContainer/FinishedChallengeDetailsViewContainer.tsx
- src/components/ContainerComponents/ViewContainer/OngoingChallengeDetailsViewContainer.tsx 11 additions, 1 deletion...ts/ViewContainer/OngoingChallengeDetailsViewContainer.tsx
- src/components/ContentComponents/FAQ/FAQ.tsx 51 additions, 5 deletionssrc/components/ContentComponents/FAQ/FAQ.tsx
- src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx 4 additions, 4 deletions...ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx
- src/components/ContentComponents/KonnectorViewer/picto-failure.png 0 additions, 0 deletions...nents/ContentComponents/KonnectorViewer/picto-failure.png
- src/db/FAQ.json 63 additions, 35 deletionssrc/db/FAQ.json
- src/services/challengeDataMapperService.ts 10 additions, 9 deletionssrc/services/challengeDataMapperService.ts
- src/styles/base/_layout.scss 3 additions, 3 deletionssrc/styles/base/_layout.scss
- src/styles/components/_challenges.scss 21 additions, 3 deletionssrc/styles/components/_challenges.scss
- src/styles/components/_ecogesture.scss 5 additions, 3 deletionssrc/styles/components/_ecogesture.scss
- src/styles/components/_faq.scss 13 additions, 3 deletionssrc/styles/components/_faq.scss
- src/styles/components/_konnector.scss 4 additions, 2 deletionssrc/styles/components/_konnector.scss
- src/styles/components/_modal.scss 1 addition, 1 deletionsrc/styles/components/_modal.scss
- src/styles/index.css 570 additions, 396 deletionssrc/styles/index.css
Loading
Please register or sign in to comment