Conflicts:
	application/modules/admin/controllers/CmsController.php
	application/modules/admin/views/scripts/cms/catform.phtml
	library/Class/AdminVar.php

Patrick Barroca authored 10 years ago and Patrick Barroca committed 10 years ago

Conflicts:
	library/ZendAfi/View/Helper/TreeView.php

Conflicts:
	application/modules/admin/controllers/CmsController.php

rel #18027 : workflow validated status is enabled when group has direct publication right or permission on this status for article's category

Merge remote-tracking branch 'refs/remotes/afi/dev#18026-categories-permissions-handling' into dev#18027-categories-permissions-retrocompat

Conflicts:
	cosmogramme/sql/patch/patch_225.sql

 Only groups with this permission can manage categories.

Merge remote-tracking branch 'refs/remotes/afi/master' into dev#18027-categories-permissions-retrocompat

Conflicts:
	application/modules/admin/controllers/CmsController.php
	application/modules/admin/controllers/OuverturesController.php
	application/modules/admin/controllers/TypeDocsController.php
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_225.sql
	library/ZendAfi/Acl/AdminControllerRoles.php
	library/ZendAfi/Form/Admin/UserGroup.php
	library/ZendAfi/View/Helper/ComboParentCategorie.php
	library/ZendAfi/View/Helper/TreeView.php
	tests/library/Class/AdminVarTest.php

Hotline 6.58

See merge request !592

Merge remote-tracking branch 'refs/remotes/afi/dev#17649_webservice_update_availability' into afi-master

Conflicts:
	library/Class/CommSigb.php
	library/ZendAfi/View/Helper/Notice/ReservationLink.php
	library/storm
	tests/library/Class/CommSigbTest.php
	tests/library/ZendAfi/View/Helper/Notice/ExemplairesTest.php

# Veuillez entrer un message de validation pour expliquer en quoi cette fusion est
# nécessaire, surtout si cela fusionne une branche amont mise à jour dans une branche de sujet.
#
# Les lignes commençant par '#' seront ignorées, et un message vide
# abandonne la validation.

Conflicts:
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
	library/Class/Codification.php
	library/ZendAfi/View/Helper/Admin/TagSelectionChamps.php
	tests/library/Class/CodificationTest.php

Hotline #17464 fix update date maj on panier notice

See merge request !586

Hotline #16956 fix popup position

See merge request !584

Hotline #18432 horizontal carousel

See merge request !585

Hotline#17925 hold mail fail

See merge request !588