Dev#27863 explo mettre en surbrillance les mots recherches

See merge request !3048

Conflicts:
	application/modules/opac/controllers/CmsController.php
	library/Class/Article.php

Merge branch 'hotline#78923_gestion_des_doublons_utilisateurs_decalage_ligne_des_utilisateurs' into 'hotline'

hotline #78923 : add expired user deletion script

See merge request !3044

Dev#87935 fonction plan d acces tableau exemplaire

See merge request !3046

Dev#86572 explo lunel web service recuperation historique de pret

See merge request !3045

Merge branch 'dev#65119_50_commande_capv38_si_boite_article_vide_ne_pas_afficher_d_article' into 'master'

dev #65119 add error message in articles widget when configuration is not valid

See merge request !3043

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#27863_explo_mettre_en_surbrillance_les_mots_recherches

Conflicts:
	application/modules/opac/controllers/RechercheController.php
	library/Class/MoteurRecherche.php
	library/Class/MoteurRecherche/Result.php
	library/ZendAfi/View/Helper/ListeNotices.php
	library/ZendAfi/View/Helper/Notice/Vignette.php

Merge branch 'hotline#87865_changer_la_methode_dappel_de_AuthenticatedPatron_de_GET_en_POST' into 'hotline'

HOTLINE #87865 - Changed AuthenticatePatron request method from GET to POST

See merge request !3034

Merge branch 'dev#86257_story_st_cloud_pnb_calculer_date_nouveaute_avec_date_commande' into 'master'

dev #86257 : PNB dilicom novelty date from order date

See merge request !3038

dev #79945 : openings duplicate and closure UI

See merge request !3035

Dev#64573 templates pour l interface publique libraire bootstrap

See merge request !2988

Merge branch 'hotline#86991_contractuel_explo_valence_integration_flux_oai_de_l_empreinte' into 'hotline'

hotline #86991 : Fixes OAI-PMH integration over HTTPS

See merge request !3026

Merge branch 'hotline#87609_les_champs_personnalises_ne_s_affichent_pas_dans_les_articles_cms' into 'hotline'

hotline#87609 : display custom_fields in article_info DL

See merge request !3029

dev#87298 : bokeh day communication

See merge request !3030

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#64573_templates_pour_l_interface_publique_libraire_bootstrap

Conflicts:
	tests/application/modules/opac/controllers/RechercheControllerHistoriqueRechercheTest.php

dev #87205 : fix XSS vulnerabilities in search screen

See merge request !3028

hotline #86956 fix cosmogramme basket import

See merge request !3024

Dev#72866 65 poker contractuel bdp64 resa multi sigb

See merge request !3025