Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

b469d2ab

Commit b469d2ab authored 4 years ago by Yoan VALLET

Downloads
- Plain Diff

Merge branch 'features/US135-CTA-enedis-activation' into 'dev'

Features/us135 cta enedis activation

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

parents f9437b20 7a092941

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/components/ContainerComponents/FluidChartContainer/FluidChartContainer.tsx 10 additions, 0 deletions

...nerComponents/FluidChartContainer/FluidChartContainer.tsx
src/components/ContentComponents/ConsumptionNavigator/ActivateHalfHourLoad.tsx 38 additions, 0 deletions

...tComponents/ConsumptionNavigator/ActivateHalfHourLoad.tsx
src/components/ContentComponents/FluidChart/FluidChartContent.tsx 1 addition, 2 deletions

...onents/ContentComponents/FluidChart/FluidChartContent.tsx
src/locales/en.json 9 additions, 0 deletions

src/locales/en.json
src/services/consumptionDataManagerService.ts 11 additions, 0 deletions

src/services/consumptionDataManagerService.ts
src/services/queryRunnerService.ts 11 additions, 1 deletion

src/services/queryRunnerService.ts
src/styles/base/_layout.scss 24 additions, 0 deletions

src/styles/base/_layout.scss

with 104 additions and 3 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