Skip to content
Snippets Groups Projects
  1. Sep 27, 2021
  2. Sep 24, 2021
  3. Sep 22, 2021
  4. Sep 21, 2021
  5. Sep 16, 2021
  6. Sep 13, 2021
  7. Sep 10, 2021
  8. Sep 09, 2021
    • naji's avatar
      Merge branch 'feat/traduction-modulaire' into 'feat/test' · 18374772
      naji authored
      KDE - 16/08/2021 - Traduction Modulaire
      
      See merge request !32
      18374772
    • descamps's avatar
    • naji's avatar
      Merge branch 'feat/test' into feat/traduction-modulaire · 58e1c984
      naji authored
      Conflicts:
      	ui/ui-frontend/package-lock.json
      	ui/ui-frontend/projects/pastis/src/app/app.component.html
      	ui/ui-frontend/projects/pastis/src/app/notice/notice.component.html
      	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/edit-profile.component.html
      	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/edit-profile.component.ts
      	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html
      	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.html
      	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.module.ts
      	ui/ui-frontend/projects/pastis/src/app/profile/list-profile/list-profile.component.html
      	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
      58e1c984
  9. Sep 07, 2021
  10. Sep 06, 2021
    • naji's avatar
      differencier utilisation file d'ariane sur les deux version · de533bd7
      naji 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/profile/list-profile/list-profile.component.ts
      de533bd7
    • couzinie's avatar
      Resolve conflit to merge branch 'feat/test' into merge-breadcumb · 9d8fa46b
      couzinie authored
      Conflicts:
      	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/edit-profile.component.ts
      	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html
      	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/profile/list-profile/list-profile.component.ts
      9d8fa46b