Merge branch 'dev#60523_contractuel_circulation_documents_entre_certains_sites_commande_bresles_maritime' into 'master'

Dev#60523 contractuel circulation documents entre certains sites commande bresles maritime

See merge request !2206

Hotline#61718 ameliorations menu admin front

See merge request !2205

Hotline master

See merge request !2198

# Conflicts:
#	VERSIONS
#	library/startup.php

Merge branch 'hotline#61715_48h_abf_sur_penlignenet_les_images_dans_la_frise_chrono_sont_en_http_et_ne_s_affichent_pas' into 'stable'

hotline #61715 : fix timeline display from widget cache

See merge request !2197

Hotline master

See merge request !2194

# Conflicts:
#	VERSIONS
#	library/startup.php

Merge branch 'hotline#61715_48h_abf_sur_penlignenet_les_images_dans_la_frise_chrono_sont_en_http_et_ne_s_affichent_pas' into 'stable'

hotline #61715 : upgrade TimelineJS version

See merge request !2192

Dev#59717 versionning des configurations de boites

See merge request !2191

Hotline master

See merge request !2188

hotline #61417 : fix redirect loop in add menu

See merge request !2186

Merge branch 'hotline#61600_l_api_oauth_doit_logguer_l_utilisateur_dans_bokeh' into 'hotline-master'

hotline #61600 : user loggued in when OAuth token is valid

See merge request !2187

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#59717_versionning_des_configurations_de_boites

Hotline master

See merge request !2184

# Conflicts:
#	VERSIONS
#	cosmogramme/sql/patch/patch_323.php
#	library/Class/CriteresRecherche.php
#	library/startup.php
#	tests/application/modules/admin/controllers/ModulesControllerTest.php
#	tests/db/UpgradeDBTest.php

Hotline#52000 recherche par genre

See merge request !2179

Hotline#60504 facette emplacement ko

See merge request !2181