Merge branch 'dev#25728_bonus_ajouter_la_possibilite_de_flux_rss_a_la_boite_sitotheque' into 'master'

Dev#25728 bonus ajouter la possibilite de flux rss a la boite sitotheque

See merge request !1196

Hotline master

See merge request !1191

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	cosmogramme/php/_init.php
#	cosmogramme/sql/patch/patch_267.php
#	cosmogramme/sql/patch/patch_268.php
#	library/startup.php

Hotline#31941 pb sur integration d une image dans un article

See merge request !1190

rel #31941: fix customized directory traversal protection for shared hosting Bokeh with dedicated virtual host

Merge branch 'hotline#30552_le_pseudo_d_un_utilisateur_abonne_sigb_ne_resiste_pas_a_la_mise_a_jour' into 'stable'

Hotline#30552 le pseudo d un utilisateur abonne sigb ne resiste pas a la mise a jour

See merge request !1189

refactoring

Merge branch 'stable' into origin-hotline#30552_le_pseudo_d_un_utilisateur_abonne_sigb_ne_resiste_pas_a_la_mise_a_jour

Conflicts:
	cosmogramme/sql/patch/patch_267.php

Conflicts:
	cosmogramme/sql/patch/patch_266.php

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php

Hotline#27768 recursive listviewmode articles

Branche recree a partir de master (tests failures)  : 1ere MR http://git.afi-sa.fr/afi/opacce/merge_requests/1169

See merge request !1187

Testing patchs

See merge request !1188

Merge branch 'hotline#27768_affichage_list_des_articles_le_filtre_ne_descend_pas_dans_les_souscategories' into hotline#27768_recursive_listviewmode_articles

Conflicts:
	VERSIONS
	library/startup.php

Hotline#31732 popup multiples sur les vignettes de notices

See merge request !1186

Merge branch 'dev#30918_developper_l_interface_suggestion_d_achat_vers_ws_nanook_realisation' into 'hotline-master'

Dev#30918 developper l interface suggestion d achat vers ws nanook realisation

See merge request !1185

Conflicts:
	VERSIONS
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_264.php
	cosmogramme/sql/patch/patch_265.php
	cosmogramme/sql/patch/patch_266.php
	cosmogramme/sql/patch/patch_267.php
	library/ZendAfi/View/Helper/Avis.php
	library/startup.php