Merge branch 'sandbox_fusion_search_result_and_print' of git.afi-sa.fr:afi/opacce into origin-sandbox_fusion_search_result_and_print

Ghislain Loas authored 10 years ago and efalcy committed 9 years ago

add example as comment

Ghislain Loas authored 10 years ago and efalcy committed 9 years ago

add tests + refacto

sandbox fusion search result : refacto , print is now available for all controllers, can print articles view

sandbox fusion : possibilité d'appeler un sous modele (notice->article) dans un modele, affichage du bouton "imprimer" si le nom d'un modele de fusion s'appelle "recherche"

Merge branch 'stable' into hotline-master

Hotline#25853

See merge request !932

Hotline#24365 bad encoded degree

See merge request !929

Hotline#26089 fix broken transfert date

See merge request !930

Hotline#24562 localization popup

See merge request !928

Hotline master

See merge request !926

Corrections de l'install

Ajout du chemin vers le fichier de conf du site Apache et correction de la phrase décrivant la config de MySql

See merge request !924

Hotline master

See merge request !921

# Conflicts:
#	tests/application/modules/admin/controllers/AccueilControllerCmsTest.php

Hotline#25855 default to pubdate sorting in domain result

See merge request !920