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

hotline#129450 e-book management when duration should be considered infinite

See merge request !3892

hotline#129637 : Advanced Search : selector on item type must display used itemtypes

See merge request !3893

hotline#127690 : Fixes an Offer Validity Issue when duration_type is MONTH in…

See merge request !3885

Merge branch 'hotline#124838_caluire_mise_en_place_connecteur_storyplay_r_acces_impossible_a_certains_albums' into 'hotline'

hotline#124838 : StoryPlayR connector : fix mediathequeid to harvest xml file

See merge request !3890

hotline#127690 : Fixes an Offer Validity Issue when duration_type is MONTH in ONIX and provided Offer file.

Hotline

See merge request !3891

Merge branch 'hotline#124508_pb_boite_libre_avec_article_comprennant_un_kiosque_de_notice' into 'hotline'

hotline MT #124508 fix rendering of widget in article

See merge request !3886

hotline MT #129517 fix no admin tools widget and dropdowns script

See merge request !3887

hotline #128992 : enlarge your perfs

See merge request !3884

Merge branch 'hotline#124307_magasin_de_themes_compte_abonne_recherche_themes_preferes_n_apparaissent_pas_dans_les_facettes' into 'hotline'

hotline MT #124307 revive bookmarked facets rendering in search result

See merge request !3877

hotline MT #128655 add timeout to fix event launch

See merge request !3883

Laurent authored 4 years ago and Sebastien ANDRE committed 4 years ago

* Session can be opened to all users using everybody can subscribe checkbox
* Session can have a starting date for subscription
* Session in mode quotas with child age minimum
* Session can have custom fields
* Activities fusionned documents can add custom fields using:
session_activity.session_activity_inscriptions["label":all_custom_fields.field_value_1]

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

Merge branch 'hotline#129160__mt_magasin_de_themes_boite_article_avec_filtres_pouvoir_afficher_tous_les_articles_et_plus_que_3_par_3' into 'hotline'

hotline MT #129160 remove storm limit when loading articles from category

See merge request !3878

Merge branch 'hotline#93016_mode_dedoublonnage_par_isbn_puis_par_cle_alpha_si_pas_d_isbn' into 'master'

hotline #93016 DoubleFinder : adds deduplication per identifiers THEN

See merge request !3880

Merge branch 'hotline#127856_harvest_log_type_doc_de_type_entier_alors_que_les_types_peuvent_etre_des_chaines' into 'hotline'

ticket #127856 : Table Harvest_log :  change datatype format of column type_doc…

See merge request !3881

Merge branch 'hotline#128944_attente_intervention_prod_intranet_prod_anomalie_sur_le_motcle_tess_pornographie_' into 'hotline'

hotline #128944 : add thesaurus facet to authority at import time

See merge request !3879

ticket #127856 : Table Harvest_log :  change datatype format of column type_doc from int(11) to varchar(255)

alpha key if no record found

Hotline

See merge request !3876

hotline MT #128767 upgrade hold wrapper badges and title

See merge request !3871

Merge branch 'hotline#115667_magasin_de_themes_affichage_du_nombre_de_reservations_pour_un_exemplaire_ou_une_notice_donnee_sur_le_site_bootstrap' into 'hotline'

hotline MT #115667 upgrade Koha items to handle current number of holds

See merge request !3873