# Conflicts:
#	.gitmodules
#	cosmogramme/sql/patch/patch_381.php
#	tests/db/UpgradeDBTest.php

Merge branch 'dev#100949_explo_contractuel_mel_recuperation_evenements_d_un_openagenda' into 'master'

dev#100949 : import events from openagenda (JSON Format)

See merge request !3329

onbootstrap

See merge request !3322

Hotline#96083 add print button

See merge request !3326

hotline#100763 : catch error when SOAP  fails on getting loans

See merge request !3315

Merge branch 'hotline#96803_le_resume_des_articles_cms_n_est_pas_indexe_dans_les_notices_bokeh' into 'hotline'

hotline #96803 add article summary, author et creation year in record indexation

See merge request !3327

hotline#99042 : add referer on sso url for artevod

See merge request !3324

Merge remote-tracking branch 'refs/remotes/origin/hotline#96083_bouton_imprimer_non_visible_dans_un_article' into hotline#96083_add_print_button

Merge branch 'hotline#95311_newsletter_de_la_bibliotheque_lien_de_desinscription_manquant_et_nouveautes' into 'hotline'

hotline#95311 : newsletter body text and html from TEXT to LONGTEXT

See merge request !3323

Merge branch 'hotline#97326_minsoc_incoherences_entre_les_listes_publiques_koha_et_les_paniers_des_professionnels_bokeh' into 'master'

hotline#97326 : lists were desynchronized between ILS and Bokeh

See merge request !3312

hotline #98553 chrome workaround for autocomplete="off" not working. See…

See merge request !3321

Laurent authored 5 years ago and Patrick Barroca committed 5 years ago

hotline #98553 chrome workaround for autocomplete="off" not working. See https://stackoverflow.com/questions/15738259/disabling-chrome-autofill

Currently translated at 100.0% (4870 of 4870 strings)

dev #99715 : handle branch in Numel import

See merge request !3320

Hotline

See merge request !3319

on bootstrap

See merge request !3318

Merge branch 'hotline#99071_inscription_a_une_activite_message_de_confirmation_envoye_20_fois' into 'hotline'

hotline #99071: prevent redirect when subscribe   and sending mail when already subscribe

See merge request !3314

dev #100226 record page displays gallica player in digital resources tab if ark…

See merge request !3317

dev #100226 record page displays gallica player in digital resources tab if ark url in subfield 856$u

Merge branch 'hotline#96803_le_resume_des_articles_cms_n_est_pas_indexe_dans_les_notices_bokeh' into 'hotline'

hotline #96803 add article summary, author et creation year in record indexation

See merge request !3310

Hotline

See merge request !3308

Merge branch 'hotline#95887_la_carte_osm_sur_les_evenements_agenda_ne_s_affiche_pas_dans_la_version_smartphone' into 'hotline'

hotline #95887 use same article rendering in phone version as opac one

See merge request !3307