Conflicts:
	cosmogramme/tests/php/classes/KohaRecordIntegrationTest.php
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
	tests/library/Class/WebService/LastfmTest.php

hotline#94750 : update label from dynamic facets

See merge request !3241

Currently translated at 100.0% (4773 of 4773 strings)

Merge remote-tracking branch 'refs/remotes/origin/hotline' into origin-hotline#94750_mise_a_jour_libelles_facettes_dynamiques

Merge remote-tracking branch 'refs/remotes/origin/hotline' into origin-hotline#94750_mise_a_jour_libelles_facettes_dynamiques

Conflicts:
	cosmogramme/tests/php/classes/NanookRecordsIntegrationTest.php

Hotline#96483 lien de reinitialisation mdp

See merge request !3246

hotline#97222 : OPAC User Account : LoanList would not display expected information about loans

See merge request !3245

Merge branch 'hotline#96508_minsoc_les_notices_taguees_dans_koha_avec_plusieurs_secteurs_thematiques_ne_remontent_que_dans_un_seul_dans_bokeh' into 'hotline'

hotline#96508 : Facets : repeated subfield would not create multiple index

See merge request !3237

bootstrap

See merge request !3215

Merge branch 'origin-master' into dev#64573_templates_pour_l_interface_publique_libraire_bootstrap_v55

Conflicts:
	tests/library/Class/WebService/LastfmTest.php
	tests/library/ZendAfi/View/Helper/Abonne/AbonnementTest.php

Dev#93553 federation des avis

See merge request !3248

Conflicts:
	cosmogramme/sql/patch/patch_377.php
	doc/extern_libs.org
	library/ZendAfi/View/Helper/Admin/HelpLink.php
	tests/db/UpgradeDBTest.php

hotline #96549 : item with <sit> 10 are holdable

See merge request !3236

hotline#94530 : Connecteur Cite de la Musique : fix  metadataPrefix

See merge request !3242

hotline#94786: cosmogramme : deleting multiple thesaurus field would leave some…

See merge request !3239

Henri-Damien LAURENT authored 5 years ago and Patrick Barroca committed 5 years ago

hotline#94786: cosmogramme : deleting multiple thesaurus field would leave some thesaurus link behind

Merge branch 'dev#78968_contractuel_st_cloud_995n_vs_995n_differenciation_de_la_casse_v40' into 'master'

dev #78968 : add uppercase location rule matching

See merge request !3238

hotline #96451 fix mail subject encoding when length > 78 characters

See merge request !3233

Merge branch 'dev#90319_contractuel_saint_cloud_tableau_resa_afficher_date_limite_de_retrait' into 'master'

dev #90319 : Orphee ILS : display end hold date in holds table

See merge request !3235

Conflicts:
	cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/DataProfileControllerTest.php
	cosmogramme/php/fonctions/objets_saisie.php
	cosmogramme/sql/patch/patch_377.php
	tests/db/UpgradeDBTest.php

Arthur Suzuki authored 5 years ago and Laurent committed 5 years ago

dev #86039 prepares calendar hold

dev #96423 ILS Orphee: add hold item option

See merge request !3228