Commits · 1ae2cbb130f125952eda5f727bac56caf3366878 · dad / Cines Vitamui

16 Mar, 2022 3 commits

Merge branch 'fix/sprint4_150322' into feat/211#321 · 1ae2cbb1

naji authored Mar 16, 2022

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

fix issue #18 absence du type dans l'export RNG suite à l'ajout de la métadonnée Language · 0d4e93fd
Baptiste Toulemonde authored Mar 16, 2022

0d4e93fd
fix jsonproperty · f0a48e12
Baptiste Toulemonde authored Mar 16, 2022

f0a48e12

15 Mar, 2022 6 commits
- fix: edition des controles · 0ce9033c
  naji authored Mar 15, 2022
  
  0ce9033c
- cahnge enums to enum · b391acbd
  Baptiste Toulemonde authored Mar 15, 2022
  
  b391acbd
- fix regex control · 46befacf
  Baptiste Toulemonde authored Mar 15, 2022
  
  46befacf
- add button edition · 0b43e184
  Baptiste Toulemonde authored Mar 15, 2022
  
  0b43e184
- fix CT 209 + other small fixes · f2a2fe8e
  Baptiste Toulemonde authored Mar 15, 2022
  
  f2a2fe8e
- fix merge conflicts · e967ab48
  Baptiste Toulemonde authored Mar 15, 2022
  
  e967ab48
14 Mar, 2022 2 commits
- Merge branch 'feature/us217' into 'develop' · 387cc180
  naji authored Mar 14, 2022
```
Feature/us217

See merge request !69
```
  387cc180
- Merge branch 'feature/us181' into 'develop' · 3bcd58ad
  naji authored Mar 14, 2022
```
US 182 182 33 30 avec develop à jour

See merge request !70
```
  3bcd58ad
11 Mar, 2022 6 commits

Merge branch 'develop' into feature/us217 · 9a8695e9
descamps authored Mar 11, 2022

9a8695e9

Merge branch 'develop' into feature/us181 · a68ff67e

descamps authored Mar 11, 2022

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

Merge branch 'feat/US-39' into develop · fba533b4

descamps authored Mar 11, 2022

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

Merge branch 'develop' into feature/us217 · 12437639
zikas96 authored Mar 11, 2022

12437639
Merge branch 'develop' into feature/us181 · 24629e5b
zikas96 authored Mar 11, 2022

24629e5b
merge branch cines_github · 2bfff36a
zikas96 authored Mar 11, 2022

2bfff36a

10 Mar, 2022 6 commits
- Merge branch 'feature/us33' into feature/us181 ==> US33 done! · d49a5e87
  Baptiste Toulemonde authored Mar 10, 2022
  
  d49a5e87
- us33 tests passed front side · a8797196
  Baptiste Toulemonde authored Mar 10, 2022
  
  a8797196
- Allow to print pattern in exported json if exist · d311e7d1
  naji authored Mar 10, 2022
  
  d311e7d1
- diminer la largeur de champs d'entre enums · 76bf97bd
  naji authored Mar 10, 2022
  
  76bf97bd
- fix: displaying windows · 9b9faa68
  naji authored Mar 10, 2022
  
  9b9faa68
- checkbox dans select enum · 80f7cb89
  Baptiste Toulemonde authored Mar 10, 2022
  
  80f7cb89
09 Mar, 2022 10 commits
- fusion travail zak et bapt · 48a2b247
  Baptiste Toulemonde authored Mar 09, 2022
  
  48a2b247
- us33 wip · 23a6c81f
  Baptiste Toulemonde authored Mar 09, 2022
  
  23a6c81f
- export ok avec control enum editer manuelement · a99f5802
  naji authored Mar 09, 2022
  
  a99f5802
- ajout input si enum vide · f7039430
  Baptiste Toulemonde authored Mar 09, 2022
  
  f7039430
- Chercher les enumeration définit dans seda pour les metadonnes · 3375a5d7
  naji authored Mar 09, 2022
  
  3375a5d7
- Merge remote-tracking branch 'origin/feature/us182' into feature/us181 · 850a28cd
  Baptiste Toulemonde authored Mar 09, 2022
  
  850a28cd
- test 201 fonctionelle wip · 54b1de5e
  Baptiste Toulemonde authored Mar 09, 2022
  
  54b1de5e
- feat: display only regularExpression and enumeration control · 6e435400
  naji authored Mar 09, 2022
  
  6e435400
- fix: traduction pour version vitamui · 42a5d927
  naji authored Mar 09, 2022
  
  42a5d927
- traduction · 2927d17b
  naji authored Mar 09, 2022
  
  2927d17b
08 Mar, 2022 6 commits
- Work in progress · b89f2d17
  naji authored Mar 08, 2022
```
	- refacto
	- need juste translate
```
  b89f2d17
- Merge remote-tracking branch 'origin/feature/us182' into feature/us181 · 64d43667
  Baptiste Toulemonde authored Mar 08, 2022
  
  64d43667
- Remonter les valeurs sélectionner pas la popup to filetree-metadata · c0cc0e9a
  naji authored Mar 08, 2022
  
  c0cc0e9a
- merge avec feature/182 suite modification model PuaModel · 3a3445b3
  Baptiste Toulemonde authored Mar 08, 2022
  
  3a3445b3
- Work in progress · 987761cc
  naji authored Mar 08, 2022
```
	 - new dto puaData
	 - modification back pastis pour priorise les controls pua sur les enumeration
	 - maquette controle schemas non terminé
```
  987761cc
- test 200 and 221 done · 14c2157b
  Baptiste Toulemonde authored Mar 08, 2022
  
  14c2157b
07 Mar, 2022 1 commit
- change css · 8d897161
  Baptiste Toulemonde authored Mar 07, 2022
  
  8d897161