# Conflicts:
#   tests/library/Class/WebService/WebAnalyticsClientTest.php

Merge branch 'hotline#80612_saint_cloud_pb_de_notion_de_dispo_dans_la_pop_up_survol_jaquette_dans_resultat_de_recherche' into 'hotline'

hotline #80612 : fix Orphee item availability detection

See merge request !2850

hotline #80724 fix horizontal sub sub menus administration

See merge request !2851

Conflicts:
	tests/library/Class/WebService/WebAnalyticsClientTest.php

Merge branch 'hotline#80700_minsoc_p2_enh_pouvoir_augmenter_la_limite_du_nombre_de_valeurs_affichees_par_facettes_affichees_jusqu_a_25_actuellement_limite_a_10' into 'hotline'

hotline #80700 : increase max displayed facet from 10 to 25

See merge request !2849

Merge branch 'hotline#80642_lekiosk_ne_plus_mettre_d_extraits_de_magazines_sur_les_notices' into 'hotline'

hotline #80642 : remove Lekiosk resources preview

See merge request !2847

Dev#71435 bonus piwik est devenu matomo

See merge request !2846

Merge branch 'hotline#80421_bokeh_ne_met_pas_a_jour_les_vignettes_suite_a_une_modification_au_niveau_de_la_notice' into 'hotline'

Hotline#80421 bokeh ne met pas a jour les vignettes suite a une modification au niveau de la notice

See merge request !2845

hotline #79510 fix calender category selector

See merge request !2844

hotline #80421 : update thumbnail of records having a configuration of marc fields and no thumbnail yet

hotline #79132 : fix case in Lekiosk SSO url param

See merge request !2843

Hotline#80193 recherche sur fiche ne devrait pas apparaitre bdp 64

See merge request !2839

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#71435_bonus_piwik_est_devenu_matomo

Conflicts:
	cosmogramme/sql/patch/patch_354.php
	tests/db/UpgradeDBTest.php

Modification library/Class/UserAgent.php : ajout des Bots mauibot,ahrefsbot et semrushbot

See merge request !2838

Hotline

See merge request !2836

hotline #80455 : fix novelty format label

See merge request !2835

Merge branch 'hotline#80427_cvs_connecte_en_superadmin_le_bloc_cvs_s_affiche_tout_le_temps' into 'hotline'

hotline #80427 do not show CVS bloc when deactivated on superadmin account

See merge request !2834

Hotline#79363 service openstreetmap bug

See merge request !2833