Merge branch 'develop' into feature/design-bis (81c30bfd) · Commits · dad / Cines Vitamui

Commit 81c30bfd authored 4 years ago by

pybelecalo

Browse files

Merge branch 'develop' into feature/design-bis

parents 41561db4 317e327c

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

integration-tests/src/test/java/fr/gouv/vitamui/cucumber/common/BaseIntegration.java 1 addition, 6 deletions

...java/fr/gouv/vitamui/cucumber/common/BaseIntegration.java
ui/ui-frontend-common/package-lock.json 15 additions, 15 deletions

ui/ui-frontend-common/package-lock.json
ui/ui-frontend-common/src/app/modules/application.service.ts 2 additions, 2 deletions

ui/ui-frontend-common/src/app/modules/application.service.ts
ui/ui-frontend-common/src/app/modules/components/application-select-content/application-select-content.component.spec.ts 1 addition, 0 deletions

...lect-content/application-select-content.component.spec.ts
ui/ui-frontend/projects/ingest/src/app/app-routing.module.ts 10 additions, 0 deletions

ui/ui-frontend/projects/ingest/src/app/app-routing.module.ts
ui/ui-frontend/projects/ingest/src/app/app.module.ts 4 additions, 0 deletions

ui/ui-frontend/projects/ingest/src/app/app.module.ts
ui/ui-frontend/projects/ingest/src/app/core/common/upload.component.html 15 additions, 16 deletions

...projects/ingest/src/app/core/common/upload.component.html
ui/ui-frontend/projects/ingest/src/app/core/common/upload.component.scss 4 additions, 0 deletions

...projects/ingest/src/app/core/common/upload.component.scss
ui/ui-frontend/projects/ingest/src/app/core/common/upload.component.spec.ts 140 additions, 0 deletions

...jects/ingest/src/app/core/common/upload.component.spec.ts
ui/ui-frontend/projects/ingest/src/app/core/common/upload.component.ts 45 additions, 23 deletions

...d/projects/ingest/src/app/core/common/upload.component.ts
ui/ui-frontend/projects/ingest/src/app/core/common/upload.module.ts 6 additions, 6 deletions

...tend/projects/ingest/src/app/core/common/upload.module.ts
ui/ui-frontend/projects/ingest/src/app/core/common/upload.service.ts 160 additions, 0 deletions

...end/projects/ingest/src/app/core/common/upload.service.ts
ui/ui-frontend/projects/ingest/src/app/holding-filling-scheme/holding-filling-scheme-routing.module.ts 75 additions, 0 deletions

...g-filling-scheme/holding-filling-scheme-routing.module.ts
ui/ui-frontend/projects/ingest/src/app/holding-filling-scheme/holding-filling-scheme.component.html 33 additions, 0 deletions

...ding-filling-scheme/holding-filling-scheme.component.html
ui/ui-frontend/projects/ingest/src/app/holding-filling-scheme/holding-filling-scheme.component.scss 20 additions, 0 deletions

...ding-filling-scheme/holding-filling-scheme.component.scss
ui/ui-frontend/projects/ingest/src/app/holding-filling-scheme/holding-filling-scheme.component.spec.ts 128 additions, 0 deletions

...g-filling-scheme/holding-filling-scheme.component.spec.ts
ui/ui-frontend/projects/ingest/src/app/holding-filling-scheme/holding-filling-scheme.component.ts 82 additions, 0 deletions

...olding-filling-scheme/holding-filling-scheme.component.ts
ui/ui-frontend/projects/ingest/src/app/holding-filling-scheme/holding-filling-scheme.module.ts 72 additions, 0 deletions

...p/holding-filling-scheme/holding-filling-scheme.module.ts
ui/ui-frontend/projects/ingest/src/app/ingest/ingest.component.html 3 additions, 1 deletion

...tend/projects/ingest/src/app/ingest/ingest.component.html
ui/ui-frontend/projects/ingest/src/app/ingest/ingest.component.spec.ts 14 additions, 0 deletions

...d/projects/ingest/src/app/ingest/ingest.component.spec.ts

with 830 additions and 69 deletions

Please register or to comment