Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

3075368b

Commit 3075368b authored 3 years ago by Hugo SUBTIL

Downloads
- Plain Diff

Merge branch 'dev' into 'master'

1.16.0

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

parents 71accf17 5c9a74ad

No related branches found

No related tags found

1 merge request!2391.16.0

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 12 additions, 13 deletions

.gitlab-ci.yml
CHANGELOG.md 12 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/map/components/map.component.ts 35 additions, 14 deletions

src/app/map/components/map.component.ts
src/app/map/services/map.service.ts 2 additions, 4 deletions

src/app/map/services/map.service.ts
src/app/shared/components/address-autocomplete/address-autocomplete.component.ts 5 additions, 1 deletion

...ts/address-autocomplete/address-autocomplete.component.ts
src/app/structure-list/components/structure-details/structure-details.component.html 1 addition, 1 deletion

...onents/structure-details/structure-details.component.html
src/app/structure-list/components/structure-details/structure-details.component.scss 2 additions, 4 deletions

...onents/structure-details/structure-details.component.scss
src/app/structure-list/components/structure-details/structure-details.component.ts 19 additions, 0 deletions

...mponents/structure-details/structure-details.component.ts
src/app/structure-list/models/category.model.ts 5 additions, 5 deletions

src/app/structure-list/models/category.model.ts
src/assets/icons/apple-touch-icon.png 0 additions, 0 deletions

src/assets/icons/apple-touch-icon.png
src/index.html 3 additions, 0 deletions

src/index.html

with 98 additions and 44 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