Commits · support · web-et-numerique / LLLE_Project / Ecolyo

07 Dec, 2020 2 commits
- Merge branch 'features/US313_popup_GRDF' into 'support' · 0526535d
  Yoan VALLET authored Dec 07, 2020
```
Add GRDF Modal

See merge request web-et-numerique/llle_project/ecolyo!140
```
  0526535d
- Add GRDF Modal · f526e757
  Guilhem CARRON authored Dec 07, 2020
  
  f526e757
26 Nov, 2020 1 commit
- version 0.2.2 with OAuth GRDF · 89977fc1
  Yoan VALLET authored Nov 26, 2020
  
  89977fc1
14 Oct, 2020 1 commit
- Merge branch 'fix/ecolyo-royal-texte-a-changer' into 'support' · a02f81e0
  Yoan VALLET authored Oct 14, 2020
```
Fix/ecolyo royal texte a changer

See merge request web-et-numerique/llle_project/ecolyo!116
```
  a02f81e0
09 Oct, 2020 1 commit
- Fix wording · d062eea8
  Rémi PAPIN authored Oct 09, 2020
  
  d062eea8
08 Oct, 2020 3 commits
- Merge branch 'revert-08bc51c3' into 'dev' · f07c019e
  Guilhem CARRON authored Oct 08, 2020
```
Revert "Change display graph per day"

See merge request web-et-numerique/llle_project/ecolyo!114
```
  f07c019e
- Revert "Change display graph per day" · 71d52317
  Guilhem CARRON authored Oct 08, 2020
```
This reverts commit 08bc51c3
```
  71d52317
- Change display graph per day · 08bc51c3
  Guilhem CARRON authored Oct 08, 2020
  
  08bc51c3
01 Oct, 2020 6 commits
- Merge branch 'fix/Old_fluid_modal' into 'support' · 17f00dae
  Guilhem CARRON authored Oct 01, 2020
```
fix text position

See merge request web-et-numerique/llle_project/ecolyo!110
```
  17f00dae
- Merge branch 'fix/Old_fluid_modal' into 'dev' · 580e1b98
  Guilhem CARRON authored Oct 01, 2020
```
fix text position

See merge request web-et-numerique/llle_project/ecolyo!109
```
  580e1b98
- Merge branch 'fix/Old_fluid_modal' into 'support' · b0bff14b
  Hugo NOUTS authored Oct 01, 2020
```
fix modal

See merge request web-et-numerique/llle_project/ecolyo!108
```
  b0bff14b
- fix text position · ea06c9f4
  Guilhem CARRON authored Oct 01, 2020
  
  ea06c9f4
- Merge branch 'fix/Old_fluid_modal' into 'dev' · 78ac0a2e
  Guilhem CARRON authored Oct 01, 2020
```
fix/Old_fluid_modal

See merge request web-et-numerique/llle_project/ecolyo!107
```
  78ac0a2e
- fix modal · d52fe459
  Guilhem CARRON authored Oct 01, 2020
  
  d52fe459
30 Sep, 2020 17 commits
- Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into support · 8ba394a0
  Yoan VALLET authored Sep 30, 2020
  
  8ba394a0
- update version to 0.2.1 · 304b1d81
  Yoan VALLET authored Sep 30, 2020
  
  304b1d81
- Merge branch 'features/US216-Change_challenge_comparison_period' into 'dev' · bf7893c0
  Guilhem CARRON authored Sep 30, 2020
```
Features/us216 change challenge comparison period

See merge request web-et-numerique/llle_project/ecolyo!100
```
  bf7893c0
- Merge branch 'features/US226_TIGA_Logo' into 'dev' · 55ac681e
  Yoan VALLET authored Sep 30, 2020
```
Features/us226 tiga logo

See merge request web-et-numerique/llle_project/ecolyo!105
```
  55ac681e
- fix merge · de8a8991
  Guilhem CARRON authored Sep 30, 2020
  
  de8a8991
- Merge branch 'dev' of... · 8a175563
  git-directory-deploy authored Sep 30, 2020
```
Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into features/US226_TIGA_Logo
```
  8a175563
- Merge branch 'fix/oauth' into 'dev' · b69c01ca
  Yoan VALLET authored Sep 30, 2020
```
use handleOAuthResponse

See merge request web-et-numerique/llle_project/ecolyo!104
```
  b69c01ca
- use handleOAuthResponse · 22ff7b3b
  Yoan VALLET authored Sep 30, 2020
  
  22ff7b3b
- replaced tiga logo · 4c162e91
  Guilhem CARRON authored Sep 30, 2020
  
  4c162e91
- disable report service · c5c1f006
  Yoan VALLET authored Sep 30, 2020
  
  c5c1f006
- Merge branch 'dev' into 'support' · 6cb9040f
  Yoan VALLET authored Sep 30, 2020
```
Dev

See merge request web-et-numerique/llle_project/ecolyo!102
```
  6cb9040f
- Merge branch 'support' into 'dev' · 89697920
  Yoan VALLET authored Sep 30, 2020
```
# Conflicts:
#   manifest.webapp
#   package.json
```
  89697920
- Merge branch 'upgrade_stack_for_oauth' into 'dev' · 2d580c6b
  Yoan VALLET authored Sep 30, 2020
```
Upgrade stack for oauth

See merge request web-et-numerique/llle_project/ecolyo!101
```
  2d580c6b
- Merge branch 'dev' of... · d5c1479e
  Yoan VALLET authored Sep 30, 2020
```
Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into upgrade_stack_for_oauth
```
  d5c1479e
- update version to 0.2.0 · 9235248c
  Yoan VALLET authored Sep 30, 2020
  
  9235248c
- feat: add redirectSlug for OAuthWindow · 9afd7872
  Yoan VALLET authored Sep 30, 2020
  
  9afd7872
- Merge branch 'dev' of... · 5039890c
  Yoan VALLET authored Sep 30, 2020
```
Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into features/US216-Change_challenge_comparison_period
```
  5039890c
29 Sep, 2020 7 commits
- feat: change is challenge is over · aa72c4ba
  Yoan VALLET authored Sep 29, 2020
  
  aa72c4ba
- upgrade cozy-harvest-lib to 2.16.0 · 882c8df9
  Yoan VALLET authored Sep 29, 2020
  
  882c8df9
- feat: change start challenge label · 99eea229
  Yoan VALLET authored Sep 29, 2020
  
  99eea229
- feat: change comparisonPeriod for month period · ff654d3f
  Yoan VALLET authored Sep 29, 2020
  
  ff654d3f
- feat: move getLagDays to utils · 1d8ab85b
  Yoan VALLET authored Sep 29, 2020
  
  1d8ab85b
- Merge branch 'update_cozy_harvest_lib' into 'dev' · ce5dedca
  Yoan VALLET authored Sep 29, 2020
```
Update cozy harvest lib

See merge request web-et-numerique/llle_project/ecolyo!99
```
  ce5dedca
- update cozy-harvest-lib version to 2.14.1 · 381999fe
  Yoan VALLET authored Sep 29, 2020
  
  381999fe
28 Sep, 2020 2 commits
- feat: change period used to calculate maxEnergy · 9e6ef557
  Yoan VALLET authored Sep 28, 2020
  
  9e6ef557
- update cozy-realtime lib · 1417c863
  Yoan VALLET authored Sep 28, 2020
  
  1417c863