Skip to content
Snippets Groups Projects
Select Git revision
0 results
Search by author
  • Any Author
0 authors
  1. Mar 22, 2022
  3. Mar 21, 2022
  5. Mar 18, 2022
  7. Mar 17, 2022
  9. Mar 16, 2022
    • naji's avatar
      Merge branch 'fix/sprint4_150322' fix ui-back tests · 13c45494
      naji authored
      13c45494
    • Baptiste Toulemonde's avatar
      fix TU issue #18 · 254d6008
      Baptiste Toulemonde authored
      254d6008
    • Baptiste Toulemonde's avatar
      fix TU US39 · 280b8a35
      Baptiste Toulemonde authored
      280b8a35
    • 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
      fix issue #18 absence du type dans l'export RNG suite à l'ajout de la métadonnée Language · 0d4e93fd
      Baptiste Toulemonde authored
      0d4e93fd
    • Baptiste Toulemonde's avatar
      fix jsonproperty · f0a48e12
      Baptiste Toulemonde authored
      f0a48e12
  11. Mar 15, 2022
  13. Mar 14, 2022
  15. Mar 11, 2022
    • 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
  17. Mar 10, 2022
  19. Mar 09, 2022