Merge branch 'dev' into 'master'
3.0 Release See merge request !1162
Showing
- .gitlab/merge_request_templates/[QA] Ecolyo.md 12 additions, 6 deletions.gitlab/merge_request_templates/[QA] Ecolyo.md
- .gitlab/merge_request_templates/default.md 25 additions, 6 deletions.gitlab/merge_request_templates/default.md
- .vscode/settings.json 11 additions, 4 deletions.vscode/settings.json
- CHANGELOG.md 34 additions, 0 deletionsCHANGELOG.md
- app.config.environment.alpha.js 7 additions, 4 deletionsapp.config.environment.alpha.js
- app.config.environment.dev.js 3 additions, 0 deletionsapp.config.environment.dev.js
- app.config.environment.prod.js 4 additions, 1 deletionapp.config.environment.prod.js
- docker-compose.yml 2 additions, 3 deletionsdocker-compose.yml
- docker/docker-compose.matomo.yml 0 additions, 2 deletionsdocker/docker-compose.matomo.yml
- manifest.webapp 7 additions, 3 deletionsmanifest.webapp
- package.json 5 additions, 5 deletionspackage.json
- scripts/createConnections.js 17 additions, 12 deletionsscripts/createConnections.js
- src/assets/icons/ico/exclamationMark.svg 28 additions, 0 deletionssrc/assets/icons/ico/exclamationMark.svg
- src/assets/icons/ico/switchGRDFDesktop.svg 0 additions, 45 deletionssrc/assets/icons/ico/switchGRDFDesktop.svg
- src/assets/icons/ico/switchGRDFMobile.svg 0 additions, 39 deletionssrc/assets/icons/ico/switchGRDFMobile.svg
- src/assets/icons/visu/equipments/OUTSIDE.svg 6 additions, 0 deletionssrc/assets/icons/visu/equipments/OUTSIDE.svg
- src/assets/icons/visu/onboarding/browser_grdf.svg 0 additions, 14 deletionssrc/assets/icons/visu/onboarding/browser_grdf.svg
- src/assets/icons/visu/onboarding/grdf-mail.svg 33 additions, 0 deletionssrc/assets/icons/visu/onboarding/grdf-mail.svg
- src/assets/icons/visu/onboarding/grdf.svg 0 additions, 37 deletionssrc/assets/icons/visu/onboarding/grdf.svg
- src/assets/icons/visu/onboarding/grdf_consent.svg 0 additions, 56 deletionssrc/assets/icons/visu/onboarding/grdf_consent.svg
Loading