Conflicts:
	api/api-pastis/pastis-standalone/run.sh
	api/api-pastis/pastis/run.sh
	ui/ui-frontend/angular.json
	ui/ui-frontend/proxy.conf.json

* Bump Spring Core, Spring Boot, Spring Security

* [XEL] Update dev spring config (#359)

* [VAS] Bug 8240 : Access file format on multi tenants organisation (#481)

Co-authored-by: Passam KASSEM <passam.kassem@focati-solutions.com>

* [TECH FOX-674] Use spring profile for UI

* [TECH FOX-671] Use spring profile for External and Internal layer

Co-authored-by: KASSEM Passam <passam.kassem@gmail.com>
Co-authored-by: Passam KASSEM <passam.kassem@focati-solutions.com>
Co-authored-by: Julien CORNILLE <julien.cornille@xelians.fr>

* Set up version from 4.5.0-SNAPSHOT to 5rc.0

* update vitamui modules with Dev modules simplification, update documents, revert --legacy-peer-deps option

Co-authored-by: pyXelians <74011448+pyXelians@users.noreply.github.com>
Co-authored-by: KASSEM Passam <passam.kassem@gmail.com>
Co-authored-by: Passam KASSEM <passam.kassem@focati-solutions.com>
Co-authored-by: Julien CORNILLE <julien.cornille@xelians.fr>
Co-authored-by: vitam-prg <no-reply@programmevitam.fr>

This reverts commit f833a6993d142d6c22fc3e765c91539a5bdf1589.

Co-authored-by: Julien CORNILLE <julien.cornille@xelians.fr>

remove packag lock

fix commits conflicts

* VAS : Add new Archive Module

* fix run issue

* add archive.yml

* add ingest host

* add forwardController to archive

* search app profile in organisation at initialization

* Cherry peak for archive search by criteria

* resolve conflicts

* rename module to archive-search and manage certificats

* Fix noisy httpd proxy error

* Add lateral panel for archive units

* fix proxy issue

* remove wrong merge file

* Add lateral panel for archive units

* fix proxy issue

* remove wrong merge file

* make holding schema auto scroll

* fix run issue

* Fix scripts j2

* update ingest labels and truncate title

* fix conflicts due to rebase on develop and update icons

fix conflicts

increase budget to 14MB, init localize

update gitignore

* fix import angular

Co-authored-by: ozerouali <oussama.zerouali@smile.fr>
Co-authored-by: EL HAJJIOUI Nabil <nabil.elhajjioui@smile.fr>
Co-authored-by: bbenarbia <benaissa.benarbia@gmail.com>

* add generateDoX method

CA3

download sample docx

add template example

add id to the url

* get the manifest and the ATR as string

add new tables

create the doc file

add generate header method

get values for doc tables

manifest and atr as string

* add titles and generate tables for the report

table 1 generator

table 2 generator

table 3 generator

table 4 generator

delete unused code

* code refactoring and fix conflicts

fix some bugs

add new requested changes

clean code

fix conflicts

* add requested changes

* add logger data

* add new message

* add requested changes

* fix build and run issues

correct services

fix ingest-preview issue

fix ingest front test

fix somme issues

* fix ansible delete

Co-authored-by: Oussama <oussama.zerouali@smile.fr>
Co-authored-by: Ro3034 <romaingordolo@gmail.com>

* [FIX TRTL-387] Fix mobile authent : add cors to cas conf

* [FOX-374] Add cors for dev environnement

* [RABB-856] set ticket expiration to 24 hours

* [US TRTL-478] Add mail attribute to idp

* [CAS] Use SAML attribute for profile id instead of SAML id

* [TECH] Fix deploy

Co-authored-by: Delphine <delphine.coursier@teamdlab.com>
Co-authored-by: Julien CORNILLE <julien.cornille@xelians.fr>
Co-authored-by: Noureddine Ouaghris <noureddine.ouaghris@teamdlab.com>
Co-authored-by: Jérôme LELEU <jerome.leleu@teamdlab.com>

* [DLAB-4154] Fix PKI: missing password in vault file for the cert vitamui

* [DLAB-4154] Improve the management of mongo scripts

- Mutualize scripts between dev environment and deployment
- Add versioning on scripts executed on a given environment

* [DLAB-4154] Upgrade scripts organization for PKI in order to authorize overrides

* [DLAB-4154] Add PKI for dev

* [DLAB-4154] Fix PKI: missing password in vault file for the cert vitamui

* [TECH] generate certs & stores for new referential apps

* [TECH] Dev environment : avoid duplication & use certs in dev-deployment in root project

* [TECH] Remove dlab mentions in yml playbook

* [TECH] Fix spelling errors

* [TECH] Generate vitamui examples certs in deployment

* [TECH] Fix spelling errors

* [TECH] Update scripts and mongo configuration for referential apps

* [TECH] Nginx add referential apps

* [TECH] Remove mitogen execution

* [TECH] Mongo dev add hosts config

* [TECH] Rollbac wrong domain names changes from PR #36

* [TECH] Fix tests

* [TECH] Move scripts into deployment

Co-authored-by: Mathieu Leguay <mathieu.leguay@ouidou.fr>
Co-authored-by: Makhtar DIAGNE <makhtar.diagne@teamdlab.com>