Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Client
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- 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

Loading

Changes 124

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 71 additions, 0 deletions

CHANGELOG.md
Dockerfile 4 additions, 0 deletions

Dockerfile
nginx/dev.conf 20 additions, 3 deletions

nginx/dev.conf
nginx/outdated.html 21 additions, 0 deletions

nginx/outdated.html
package-lock.json 1 addition, 1 deletion

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

package.json
src/app/about/about.component.html 33 additions, 22 deletions

src/app/about/about.component.html
src/app/about/about.component.scss 12 additions, 0 deletions

src/app/about/about.component.scss
src/app/admin/components/claim-structure/claim-structure.component.html 2 additions, 2 deletions

...components/claim-structure/claim-structure.component.html
src/app/admin/components/claim-structure/claim-structure.component.scss 0 additions, 0 deletions

...components/claim-structure/claim-structure.component.scss
src/app/admin/components/claim-structure/claim-structure.component.ts 0 additions, 1 deletion

...n/components/claim-structure/claim-structure.component.ts
src/app/admin/components/panel/panel.component.scss 0 additions, 0 deletions

src/app/admin/components/panel/panel.component.scss
src/app/admin/components/panel/panel.component.ts 0 additions, 1 deletion

src/app/admin/components/panel/panel.component.ts
src/app/admin/models/demandAttachment.model.ts 1 addition, 0 deletions

src/app/admin/models/demandAttachment.model.ts
src/app/app-routing.module.ts 15 additions, 0 deletions

src/app/app-routing.module.ts
src/app/app.component.ts 3 additions, 1 deletion

src/app/app.component.ts
src/app/app.module.ts 5 additions, 1 deletion

src/app/app.module.ts
src/app/footer/footer.component.html 0 additions, 1 deletion

src/app/footer/footer.component.html
src/app/footer/footer.component.scss 2 additions, 6 deletions

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

src/app/form/footer-form/footer-form.component.html

with 202 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