Merge branch 'dev#69826_contractuel_minsoc_diffusion_selective_de_l_information_enregistrer_modifier_ma_recherche' into 'master'

Dev#69826 contractuel minsoc diffusion selective de l information enregistrer modifier ma recherche

See merge request !2516

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#69826_contractuel_minsoc_diffusion_selective_de_l_information_enregistrer_modifier_ma_recherche

Conflicts:
	application/modules/admin/views/scripts/album/edit-images.phtml
	cosmogramme/sql/patch/patch_342.php
	library/ZendAfi/Controller/Plugin/Manager/Sitotheque.php
	library/ZendAfi/View/Helper/TagPreview.php
	library/ZendAfi/View/Helper/TagSlideshow.php
	tests/application/modules/admin/controllers/AdminControllerTest.php
	tests/application/modules/admin/controllers/CatalogueControllerTest.php
	tests/application/modules/admin/controllers/CmsControllerTest.php
	tests/application/modules/admin/controllers/IndexControllerTest.php
	tests/application/modules/admin/controllers/ProfilControllerIndexTest.php
	tests/application/modules/opac/controllers/PanierControllerTest.php
	tests/db/UpgradeDBTest.php
	tests/library/ZendAfi/View/Helper/Accueil/BibNumeriqueTest.php

Hotline master

See merge request !2513

Conflicts:
	VERSIONS
	cosmogramme/sql/patch/patch_340.php
	library/startup.php
	tests/fixtures/NanookFixtures.php

dev #71738 : guard memory comsuption of patch 337

See merge request !2511

Dev#71715 explorateur de fichiers

See merge request !2508

Merge branch 'hotline#71540_probleme_de_connexion_d_un_usager_sur_la_webotheque52' into 'hotline-master'

hotline #71540 : CVS : fix xml validity when login contains ampersand

See merge request !2494

Dev#71664 prettyphoto ko

See merge request !2507

Merge branch 'dev#71456_nettoyer_les_entrees_de_menu_de_bib_num_qui_sont_inutiles_et_dangereuses' into 'master'

Dev#71456 nettoyer les entrees de menu de bib num qui sont inutiles et dangereuses

See merge request !2504

Merge branch 'dev#71408_mise_en_valeur_des_chiffres_assistance_liste_des_fonctionalites_moderations_chiffre_sur_rond_de_fond_rouge_cf_reseaux_sociaux' into 'master'

Dev#71408 mise en valeur des chiffres assistance liste des fonctionalites moderations chiffre sur rond de fond rouge cf reseaux sociaux

See merge request !2503

dev #71409 add video links to features list

See merge request !2502

Dev#71600 fix filemanager

See merge request !2496

dev #71600 add validator to input import file + remove white space from authorized char in filenames