1. 16 Mar, 2022 3 commits
    • naji's avatar
      Merge branch 'fix/sprint4_150322' into feat/211#321 · 1ae2cbb1
      naji authored
      Conflicts:
      	ui/ui-frontend/projects/pastis/src/app/main/main.component.ts
      	ui/ui-frontend/projects/pastis/src/app/models/file-node.ts
      	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss
      	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts
      	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.service.ts
      	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.component.ts
      	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.service.ts
      	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/pipes/file-tree-filter.pipe.spec.ts
      	ui/ui-frontend/projects/pastis/src/app/profile/list-profile/list-profile.component.ts
      	ui/ui-frontend/projects/pastis/src/app/profile/profile.module.ts
      	ui/ui-frontend/projects/pastis/src/app/shared/pastis-popup-option/pastis-popup-option.component.ts
      	ui/ui-frontend/projects/pastis/src/app/shared/shared.module.ts
      	ui/ui-frontend/projects/pastis/src/app/user-actions/save-profile/save-profile.component.ts
      	ui/ui-frontend/projects/pastis/src/app/user-actions/user-actions.module.ts
      1ae2cbb1
    • Baptiste Toulemonde's avatar
    • Baptiste Toulemonde's avatar
      fix jsonproperty · f0a48e12
      Baptiste Toulemonde authored
      f0a48e12
  2. 15 Mar, 2022 6 commits
  3. 14 Mar, 2022 2 commits
  4. 11 Mar, 2022 6 commits
    • descamps's avatar
      Merge branch 'develop' into feature/us217 · 9a8695e9
      descamps authored
      9a8695e9
    • descamps's avatar
      Merge branch 'develop' into feature/us181 · a68ff67e
      descamps authored
      Conflicts:
      	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts
      	ui/ui-frontend/projects/pastis/src/app/user-actions/add-metadata/add-metadata.component.ts
      	ui/ui-frontend/projects/pastis/src/app/user-actions/user-actions.module.ts
      a68ff67e
    • descamps's avatar
      Merge branch 'feat/US-39' into develop · fba533b4
      descamps authored
      Conflicts:
      	api/api-pastis/pastis-commons/src/main/java/fr/gouv/vitamui/pastis/common/service/PuaFromJSON.java
      	ui/ui-frontend/projects/pastis/src/app/models/pua.model.ts
      	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts
      	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.component.ts
      	ui/ui-frontend/projects/pastis/src/app/user-actions/add-metadata/add-metadata.component.ts
      	ui/ui-frontend/projects/pastis/src/app/user-actions/save-profile/save-profile.component.ts
      	ui/ui-frontend/projects/pastis/src/app/user-actions/user-actions.module.ts
      fba533b4
    • zikas96's avatar
      Merge branch 'develop' into feature/us217 · 12437639
      zikas96 authored
      12437639
    • zikas96's avatar
      Merge branch 'develop' into feature/us181 · 24629e5b
      zikas96 authored
      24629e5b
    • zikas96's avatar
      merge branch cines_github · 2bfff36a
      zikas96 authored
      2bfff36a
  5. 10 Mar, 2022 6 commits
  6. 09 Mar, 2022 10 commits
  7. 08 Mar, 2022 6 commits
  8. 07 Mar, 2022 1 commit