Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

92687ec4

Commit 92687ec4 authored 3 years ago by Hugo SUBTIL

Downloads
- Plain Diff

Merge branch 'dev' into 'master'

1.14

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

parents 2f8142ee aa97b422

No related branches found

No related tags found

1 merge request!2201.14

Changes 81

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 48 additions, 47 deletions

.gitlab-ci.yml
CHANGELOG.md 35 additions, 0 deletions

CHANGELOG.md
Dockerfile 3 additions, 2 deletions

Dockerfile
nginx/dev.conf 1 addition, 2 deletions

nginx/dev.conf
ngsw-config.json 10 additions, 0 deletions

ngsw-config.json
package-lock.json 141 additions, 1 deletion

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

package.json
src/app/admin/components/manage-users/administred-structures/administred-structures.component.html 1 addition, 1 deletion

...inistred-structures/administred-structures.component.html
src/app/app.module.ts 2 additions, 0 deletions

src/app/app.module.ts
src/app/carto/carto.component.scss 1 addition, 1 deletion

src/app/carto/carto.component.scss
src/app/carto/carto.component.ts 8 additions, 1 deletion

src/app/carto/carto.component.ts
src/app/contact/contact.component.ts 9 additions, 1 deletion

src/app/contact/contact.component.ts
src/app/form/footer-form/footer-form.component.html 21 additions, 5 deletions

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

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

src/app/form/footer-form/footer-form.component.ts
src/app/form/orientation-form/component/orientation-modal/orientation-modal.component.html 30 additions, 0 deletions

...ponent/orientation-modal/orientation-modal.component.html
src/app/form/orientation-form/component/orientation-modal/orientation-modal.component.scss 27 additions, 0 deletions

...ponent/orientation-modal/orientation-modal.component.scss
src/app/form/orientation-form/component/orientation-modal/orientation-modal.component.spec.ts 26 additions, 0 deletions

...ent/orientation-modal/orientation-modal.component.spec.ts
src/app/form/orientation-form/component/orientation-modal/orientation-modal.component.ts 20 additions, 0 deletions

...omponent/orientation-modal/orientation-modal.component.ts
src/app/form/orientation-form/component/structure-detail-print/structure-detail-print.component.html 5 additions, 76 deletions

...ucture-detail-print/structure-detail-print.component.html

with 437 additions and 146 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