Master

Dev#21441 custom fields facets

See merge request !1119

Conflicts:
	VERSIONS
	library/startup.php
	tests/application/modules/opac/controllers/AbonneControllerSuggestionAchatTest.php

Conflicts:
	VERSIONS

Hotline#29788 changement d icone

See merge request !1107

Hotline#27654 menu qui se replie

See merge request !1115

Dev #26120 typo3 import update

See merge request !1118

Conflicts:
	cosmogramme/sql/patch/patch_268.php

fix suggest link not working in chrome

Better print link

translate admin menu

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_267.php
	library/Class/Notice.php

Dilicom variables now accessible to portal admins

Hotline#24999 gestion des isbn a l import cosmogramme

See merge request !1108

Merge branch 'origin-dev_#29968_admin_variable_for_limit_loans_duration' into origin-dev#29548_pnb_pre_prod

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

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_267.php

Conflicts:
	library/Class/MoteurRecherche/Facettes.php
	library/ZendAfi/Form/Configuration/SearchResult.php
	tests/application/modules/admin/controllers/ModulesControllerTest.php
	tests/library/Class/MoteurRecherche/MoteurRechercheFacettesTest.php

RT comments

RT comments

typo fix

RT comments

Conflicts solved:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_266.php

Hotline#28305 un redacteur a le droit de modifier le nom de domaine

See merge request !1112

Hotline#29569 portail

See merge request !1110

rel #24999 : Bokeh keeps isbn of document type of "book" pergame family + between multiple isbn, Bokeh keeps only last longest one

Hotline master

See merge request !1105

fix tests

remove references to end loan

tab 2 spaces

Conflicts:
	VERSIONS
	library/startup.php
	tests/library/ZendAfi/MailTest.php

# Veuillez entrer un message de validation pour expliquer en quoi cette fusion est
# nécessaire, surtout si cela fusionne une branche amont mise à jour dans une branche de sujet.
#
# Les lignes commençant par '#' seront ignorées, et un message vide
# abandonne la validation.

Dev#25584 ajout de formulaires qui s envoient par mail

See merge request !1103

Merge branch 'hotline#29825_facette_dynamique_public_repetition_des_occurrences_pbm_identique_a_st_dizier_resolu_par_ghislain' into 'stable'

Hotline#29825 facette dynamique public repetition des occurrences pbm identique a st dizier resolu par ghislain

c'est à cause de patrick

See merge request !1102

Merge branch 'hotline#29825_facette_dynamique_public_repetition_des_occurrences_pbm_identique_a_st_dizier_resolu_par_ghislain' into 'stable'

Hotline#29825 facette dynamique public repetition des occurrences pbm identique a st dizier resolu par ghislain

See merge request !1096

Merge branch 'hotline#29412_images_des_articles_dans_le_resultat_de_recherche' into 'hotline-master'

Hotline#29412 images des articles dans le resultat de recherche

See merge request !1093

remove Notice::getArticleCms() that duplicates getArticle()

description) on "indeaxable" checkbox.

hotline #29825 clean codifThesaurus table where code is null and rules is null in full integration clean phase

Hotline#29345 lettre d information envoi incomplet

See merge request !1098

Hotline#29371 amdin bokeh lien n de version

See merge request !1095

Hotline#29633 envoi newsletter

See merge request !1097

rel #29345 : zend mail validator can throw exceptions on domain validation failure, consider this as an invalid mail

Update install doc

See merge request !1086

fix patch 267

input on fourth position

fix patch 267

input on fourth position

Merge branch 'hotline#29622_la_fonction_explorer_le_serveur_tourne_dans_le_vide' into 'hotline-master'

Hotline#29622 la fonction explorer le serveur tourne dans le vide

See merge request !1094

rel #29622 : fix customized directory traversal protection for shared hosting bokeh with dedicated virtual host