cdev#91960 : rendez-vous : add custom fields

See merge request !3139

Hotline

See merge request !3128

hotline 88956 : fix memory limit

See merge request !3127

Currently translated at 100.0% (4552 of 4552 strings)

Conflicts:
	cosmogramme/sql/patch/patch_370.php
	tests/db/UpgradeDBTest.php

Merge branch 'dev#88078_commande_bdp_yonne_module_d_aide_a_la_planification_des_echanges_v2_batch_notification_gestion_de_modele_mail_dans_admin_var' into 'master'

dev#88078 : Notification des rendez vous

See merge request !3110

hotline#90657 : File-Manager was not disable according to permissions

See merge request !3123

dev#64573 work on account

See merge request !3124

Merge branch 'origin-master' into dev#64573_55_templates_pour_l_interface_publique_libraire_bootstrap

Merge branch 'hotline#90710_identification_par_mail_ko_le_mdp_ne_remonte_pas_dans_nanook' into 'hotline'

hotline #90710 : fix secure password sent to SIGB

See merge request !3122

hotline #91398 : Skilleos API Update

See merge request !3121

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

Conflicts:
	library/digital_resources/Skilleos/Service/Parser.php
	library/digital_resources/Skilleos/tests/SkilleosTest.php
	library/digital_resources/Skilleos/tests/results.json

hotline#88956 : add authors migration script

See merge request !3109

Merge branch 'hotline#91864_lettre_d_information_rien_n_est_selectionne_et_pourtant_tout_est_envoye' into 'hotline'

hotline #91864 : fix newsletter articles selection

See merge request !3120

Merge branch 'hotline#91081_bouton_inspector_gadget_serveur_de_cache_present_plusieurs_fois' into 'hotline'

hotline #91081 : Cache serveur calls in Inspector Gadget Webservice calls button

See merge request !3119

Merge branch 'hotline#90675_bdp10_transformation_xml_n_a_pas_fonctionne_pour_une_notice' into 'hotline'

hotline #90675 : xslt empty transform message enlightment

See merge request !3118

Merge branch 'hotline#87795_inclure_des_articles_dans_les_lettres_d_information_images_ko_et_ordre_des_articles_ko' into 'hotline'

hotline#87795 : fix Newsletter articles order by selection

See merge request !3112

hotline#87884 : added and error message on bloc or tab loading in view notice

See merge request !3113

hotline #90727 : fix link to ILS when user is promoted to patron

See merge request !3116

hotline #83325 PNB Dilicom : fix download for an user that currently loan it and…

See merge request !3108

Merge branch 'hotline#91613_le_contenu_css_de_l_editeur_n_est_pas_modifie_alors_qu_il_me_dit_qu_il_est_sauvegarde' into 'hotline'

hotline #91613 CSS editor force cache invalidation

See merge request !3111

Merge branch 'dev#88526_nanookbokeh_pouvoir_afficher_une_notice_a_partir_de_l_identifiant_sigb_dans_l_url' into 'master'

dev #88526 add url recherche/viewnotice/id_sigb/xxx/id_site/xxx to open a record from Nanook

See merge request !3114

MAJ cookies.phtml

See merge request !3115

<h3><?php echo $this->_('Durée de conservation des cookies ?');?></h3>

<p><?php echo $this->_('Les cookies déposés par Bokeh ont une durée de vie maximale de 12 mois et 2 semaines.');?>