Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

bc2dcc7f

Commit bc2dcc7f authored 3 years ago by Hugo SUBTIL

Downloads
- Plain Diff

Merge branch 'dev' into 'master'

Dev

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

parents eb18978c 0c835e14

No related branches found

No related tags found

Loading

Changes 47

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 27 additions, 0 deletions

CHANGELOG.md
package-lock.json 1 addition, 1 deletion

package-lock.json
package.json 1 addition, 1 deletion

package.json
src/app/admin/components/newsletter-users/newsletter-users.component.html 2 additions, 1 deletion

...mponents/newsletter-users/newsletter-users.component.html
src/app/footer/footer.component.ts 0 additions, 8 deletions

src/app/footer/footer.component.ts
src/app/form/structure-form/form.component.html 180 additions, 59 deletions

src/app/form/structure-form/form.component.html
src/app/form/structure-form/form.component.scss 30 additions, 3 deletions

src/app/form/structure-form/form.component.scss
src/app/form/structure-form/form.component.ts 34 additions, 17 deletions

src/app/form/structure-form/form.component.ts
src/app/header/header.component.scss 2 additions, 1 deletion

src/app/header/header.component.scss
src/app/map/components/map.component.scss 4 additions, 1 deletion

src/app/map/components/map.component.scss
src/app/map/components/map.component.ts 47 additions, 10 deletions

src/app/map/components/map.component.ts
src/app/map/components/markerType.enum.ts 1 addition, 0 deletions

src/app/map/components/markerType.enum.ts
src/app/map/services/map.service.ts 69 additions, 56 deletions

src/app/map/services/map.service.ts
src/app/map/services/marker.ts 73 additions, 0 deletions

src/app/map/services/marker.ts
src/app/models/structure.model.ts 10 additions, 1 deletion

src/app/models/structure.model.ts
src/app/post/components/post-details/post-details.component.ts 11 additions, 3 deletions

...pp/post/components/post-details/post-details.component.ts
src/app/reset-password/reset-password.component.html 1 addition, 39 deletions

src/app/reset-password/reset-password.component.html
src/app/reset-password/reset-password.component.scss 15 additions, 7 deletions

src/app/reset-password/reset-password.component.scss
src/app/reset-password/reset-password.component.ts 5 additions, 28 deletions

src/app/reset-password/reset-password.component.ts
src/app/resolvers/structure.resolver.ts 0 additions, 2 deletions

src/app/resolvers/structure.resolver.ts

with 513 additions and 238 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