Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

madis
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

5a115021

Commit 5a115021 authored 4 years ago by Loïc PROUST

Downloads
- Plain Diff

Merge branch '295-multi-fix' into 'develop'

Multi fix on users collectivity show, domain are now counted on bilan and fix...

Closes #295

See merge request soluris/madis!178

parents 13449384 2d847cec

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 6 additions, 0 deletions

CHANGELOG.md
config/packages/framework.yaml 1 addition, 1 deletion

config/packages/framework.yaml
src/Domain/Registry/Controller/MesurementController.php 3 additions, 4 deletions

src/Domain/Registry/Controller/MesurementController.php
src/Domain/Reporting/Generator/Word/MaturityGenerator.php 50 additions, 51 deletions

src/Domain/Reporting/Generator/Word/MaturityGenerator.php
templates/User/Profile/collectivity_show.html.twig 1 addition, 1 deletion

templates/User/Profile/collectivity_show.html.twig

with 61 additions and 57 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