Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

a67898c7

Commit a67898c7 authored 4 years ago by Hugo SUBTIL

Downloads
- Plain Diff

Merge branch 'dev' into 'recette'

Dev

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client!84

parents 44de48e3 d2681178

No related branches found

No related tags found

2 merge requests!85Recette,!84Dev

Changes 124

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/app/form/footer-form/footer-form.component.scss 4 additions, 13 deletions

src/app/form/footer-form/footer-form.component.scss
src/app/form/footer-form/footer-form.component.spec.ts 0 additions, 0 deletions

src/app/form/footer-form/footer-form.component.spec.ts
src/app/form/footer-form/footer-form.component.ts 1 addition, 0 deletions

src/app/form/footer-form/footer-form.component.ts
src/app/form/form.component.html 447 additions, 273 deletions

src/app/form/form.component.html
src/app/form/form.component.scss 129 additions, 43 deletions

src/app/form/form.component.scss
src/app/form/form.component.spec.ts 7 additions, 8 deletions

src/app/form/form.component.spec.ts
src/app/form/form.component.ts 557 additions, 187 deletions

src/app/form/form.component.ts
src/app/form/pageType.enum.ts 26 additions, 0 deletions

src/app/form/pageType.enum.ts
src/app/guards/admin.guard.ts 1 addition, 4 deletions

src/app/guards/admin.guard.ts
src/app/guards/auth.guard.ts 4 additions, 5 deletions

src/app/guards/auth.guard.ts
src/app/header/header.component.html 4 additions, 2 deletions

src/app/header/header.component.html
src/app/header/header.component.scss 3 additions, 9 deletions

src/app/header/header.component.scss
src/app/header/header.component.ts 28 additions, 9 deletions

src/app/header/header.component.ts
src/app/home/home.component.spec.ts 0 additions, 1 deletion

src/app/home/home.component.spec.ts
src/app/home/home.component.ts 2 additions, 3 deletions

src/app/home/home.component.ts
src/app/map/components/map.component.scss 14 additions, 3 deletions

src/app/map/components/map.component.scss
src/app/map/components/map.component.ts 5 additions, 15 deletions

src/app/map/components/map.component.ts
src/app/map/services/map.service.ts 5 additions, 38 deletions

src/app/map/services/map.service.ts
src/app/models/owner.model.ts 4 additions, 0 deletions

src/app/models/owner.model.ts
src/app/models/structure.model.ts 8 additions, 1 deletion

src/app/models/structure.model.ts

with 1249 additions and 614 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