Hotline master

Conflicts:
	VERSIONS
	application/modules/admin/views/scripts/modo/index.phtml
	library/ZendAfi/View/Helper/FonctionsAdmin.php
	library/startup.php

Hotline#38320 add try catch to cosmogramme cleanmemory propagation

See merge request !1484

Hotline#38299 confirm should be place on anchor not on img

See merge request !1483

Hotline#38336 only index article on post edit action

See merge request !1482

Hotline#37078 cosmo generator path fixphp

See merge request !1481

Merge branch 'hotline#33533_avis_disfonctionnement_affichage_des_boites_accordeon_sur_validation' into 'stable'

Hotline#33533 avis disfonctionnement affichage des boites accordeon sur validation

See merge request !1485

Stable

See merge request !1486

fix rt : refacto dupli

fix tests

fix rt

fix tests

keep params in differents actions

Merge branch 'hotline#37341_perte_des_types_doc_en_resultat_de_recherche_dans_charte_graphique' into 'stable'

Hotline#37341 perte des types doc en resultat de recherche dans charte graphique

See merge request !1478

Hotline#37199 bug ergonomique dans la partie moderation

See merge request !1474

Dev#37100 optimisation du code cote navigateur pour casqy

See merge request !1476

Dev#37440 lien 1d touch versions

See merge request !1466

Stable

See merge request !1480

Hotline#38223 bokeh mutu php fatal error class imagick not found

See merge request !1479

redirect to referer

Conflicts:
	VERSIONS
	library/startup.php

Hotline#36925 fix user form select id site

See merge request !1469

Conflicts:
	application/modules/admin/controllers/UsersController.php
	application/modules/admin/views/scripts/users/index.phtml

Hotline#36925 admin users index

See merge request !1459

Merge branch 'hotline#37359_mooderation_avis_les_nombres_d_avis_a_moderer_sont_inexacts' into 'stable'

Hotline#37359 mooderation avis les nombres d avis a moderer sont inexacts

See merge request !1467

fix rt

fix display orphan opinions

Hotline#37850 fix onedtouch fatal error on import with 504 response

See merge request !1460

Merge branch 'hotline#37078_cosmogramme_le_lien_de_generation_de_site_nanook_ne_cree_pas_les_imports_paniers' into 'stable'

Hotline#37078 cosmogramme le lien de generation de site nanook ne cree pas les imports paniers

See merge request !1462

Merge branch 'hotline#37886_moderation_inscriptions_inversement_des_informations' into 'hotline-master'

Hotline#37886 moderation inscriptions inversement des informations

See merge request !1465

Hotline#37718 probleme d affichage boite calendrier

See merge request !1463

fix tests

fix css retro bokeh74

fix rt : new tests

tests + refacto

Merge branch 'hotline#37405_probleme_d_affichage_de_la_forge_l_interface_d_administration_bokeh' into 'stable'

Hotline#37405 probleme d affichage de la forge l interface d administration bokeh

See merge request !1456

Hotline#37877 pb d affichage sur la nouvelle charte

See merge request !1457

change version message

change version message

change version message

Merge branch 'stable' into 'hotline#37078_cosmogramme_le_lien_de_generation_de_site_nanook_ne_cree_pas_les_imports_paniers'

Stable

See merge request !1461

Stable

See merge request !1458

fix max table width