Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

b64c4e46

Commit b64c4e46 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!102

parents a67898c7 0780eeea

No related branches found

No related tags found

2 merge requests!103Recette,!102Dev

Changes 85

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 24 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/claim-structure/claim-structure.component.ts 10 additions, 6 deletions

...n/components/claim-structure/claim-structure.component.ts
src/app/admin/services/admin.service.ts 20 additions, 4 deletions

src/app/admin/services/admin.service.ts
src/app/app-routing.module.ts 5 additions, 0 deletions

src/app/app-routing.module.ts
src/app/app.component.html 2 additions, 2 deletions

src/app/app.component.html
src/app/app.component.scss 7 additions, 3 deletions

src/app/app.component.scss
src/app/app.component.ts 14 additions, 2 deletions

src/app/app.component.ts
src/app/form/form.component.html 23 additions, 19 deletions

src/app/form/form.component.html
src/app/form/form.component.scss 7 additions, 6 deletions

src/app/form/form.component.scss
src/app/header/header.component.html 4 additions, 8 deletions

src/app/header/header.component.html
src/app/header/header.component.scss 6 additions, 1 deletion

src/app/header/header.component.scss
src/app/home/home.component.scss 1 addition, 1 deletion

src/app/home/home.component.scss
src/app/map/components/map.component.scss 10 additions, 1 deletion

src/app/map/components/map.component.scss
src/app/models/user.model.ts 1 addition, 0 deletions

src/app/models/user.model.ts
src/app/post/components/post-card/post-card.component.html 34 additions, 0 deletions

src/app/post/components/post-card/post-card.component.html
src/app/post/components/post-card/post-card.component.scss 81 additions, 0 deletions

src/app/post/components/post-card/post-card.component.scss
src/app/post/components/post-card/post-card.component.spec.ts 25 additions, 0 deletions

...app/post/components/post-card/post-card.component.spec.ts
src/app/post/components/post-card/post-card.component.ts 21 additions, 0 deletions

src/app/post/components/post-card/post-card.component.ts

with 297 additions and 55 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