Master

Hotline master

See merge request !1514

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

Conflicts:
	VERSIONS
	library/Class/Users.php
	library/startup.php

Merge branch 'hotline#38918_module_formation_ajout_de_champs_dans_les_modeles_de_courrier_codes_de_champs' into 'stable'

Hotline#38918 module formation ajout de champs dans les modeles de courrier codes de champs

See merge request !1513

Hotline#38583 bug dans le paginateur des groupes d utilisateurs

See merge request !1512

Hotline#37996 activation premier chapitre ok image ancrable nok

See merge request !1511

Hotline master

See merge request !1509

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

Conflicts:
	VERSIONS
	library/startup.php

Hotline#38716 calice68 pb catcha sur httpwwwcalice68frauthregister

See merge request !1503

Hotline master

See merge request !1499

Conflicts:
	VERSIONS
	library/startup.php

Hotline#37996 premier chapitre fix urls

See merge request !1497

Conflicts:
	VERSIONS
	cosmogramme/php/_init.php
	library/startup.php
	tests/db/UpgradeDBTest.php

Hotline#9366 grosse faute message d indisponibilite

See merge request !1494

Dev#37757 fixer la refonte de l administration

See merge request !1495

fix message syntax

Hotline#37288 localisation d un exemplaire inccorect

See merge request !1493

fix getBestCote -> get sigb exemplaire

Hotline master

See merge request !1490

Merge branch 'dev#35272_inscription_d_un_lecteur_dans_calice68_pour_authentification_unique_vers_les_services_numeriques' into 'stable'

Dev#35272 inscription d un lecteur dans calice68 pour authentification unique vers les services numeriques

See merge request !1487

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#37760 mise en production de casa pnb

See merge request !1477

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