Master

Hotline master

See merge request !2463

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

hotline #69326 fix cite de la musique patch

See merge request !2462

Merge branch 'hotline#65216_pb_sur_mise_a_jour_des_articles_apres_modification_d_un_carrousel' into 'stable'

hotline #65216 article edit: when slideshow dialog is closed, validate button enabled

See merge request !2453

hotline #65274 update tlds

See merge request !2454

Hotline#66056 bron pb responsabilites auteurs

See merge request !2455

hotline #66631 when CSS editor is closed, disable in it front admin menu

See merge request !2456

hotline #66995 fix usergroup tree management

See merge request !2457

hotline #68975 fix article back button after save

See merge request !2458

Merge branch 'hotline#68332_champ_personnalise_supprime_qui_s_affiche_toujours_dans_les_filtres_de_recherche_de_l_agenda' into 'stable'

hotline #68332 fix custom_field_values deletion when article deleted

See merge request !2459

Merge branch 'hotline#66376_les_dates_d_ouvertures_exceptionnelles_doivent_s_afficher_30j_avant_la_date_de_debut' into 'stable'

hotline #66376 display overlapsed openings 30 days before validity start

See merge request !2460

Merge branch 'hotline#67041_boite_article_creation_article_depuis_le_front_ne_l_ajoute_pas_a_la_liste_parametrage_cle_plate' into 'stable'

hotline #67041 fix widget configuration parameters loading

See merge request !2461

7.11.15

Conflicts:
	VERSIONS
	cosmogramme/sql/patch/patch_339.php
	library/startup.php

Hotline#64820 connecteur cite de la musique

See merge request !2450

Merge branch 'hotline#65920_boites_kiosque_fonction_de_tirage_aleatoire_ne_fonctionne_pas' into 'stable'

hotline #65920 kiosk widget: random option fix

See merge request !2452

hotline #66892 mobile: fix "next page"  on search result

See merge request !2451

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

# Conflicts:
#	VERSIONS
#	library/startup.php
#	public/opac/java/mycarousel_horizontal/jMyCarousel.pack.js
#	public/opac/java/mycarousel_vertical/jMyCarousel.pack.js

Hotline#66771 date de validite de la carte lecteur

See merge request !2447

Hotline#62058 kiosque en mode responsive ko vsr cavy

See merge request !2446

hotline #67053 : change admin menu order

See merge request !2448

hotline #66771 : do not erase user information from file import when webservice does not provide them