Master (!1231) · Merge requests · afi / opacce · GitLab

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Merged Master

master into WIP

Merged Patrick Barroca requested to merge master into WIP 9 years ago

Nov 05, 2015
- Merge branch 'hotline-master' into 'master' · 775278e5
  Patrick Barroca authored 9 years ago
```
Hotline master

See merge request !1230
```
  775278e5
- version 7.3.25 · 1da72753
  Patrick Barroca authored 9 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php
```
  1da72753
- version 7.2.24 · fa740e52
  Patrick Barroca authored 9 years ago
  
  fa740e52
- Merge branch 'hotline#32417_pb_envoi_mail_fusion_pour_adulte' into 'stable' · 9b36e615
  Patrick Barroca authored 9 years ago
```
Hotline#32417 pb envoi mail fusion pour adulte

See merge request !1229
```
  9b36e615
Nov 04, 2015

rel #32417 : fix filemanager authorization to accept filenames containing two dots · 2717dd84
Patrick Barroca authored 9 years ago

2717dd84

Merge branch... · 4d07b8b8

Patrick Barroca authored 9 years ago

Merge branch 'hotline#31887_l_extension_de_recherche_vers_gallica_ne_fonctionne_pas' into 'hotline-master'

Hotline#31887 l extension de recherche vers gallica ne fonctionne pas

See merge request !1227

4d07b8b8

rel #31887: escape html sensitive chars in url · 190c9058
Patrick Barroca authored 9 years ago

190c9058

Merge branch... · c1362332

Patrick Barroca authored 9 years ago

Merge branch 'hotline#32179_quand_on_clique_sur_la_vignette_l_image_s_ouvre_dans_un_nouvel_onglet' into 'stable'

Hotline#32179 quand on clique sur la vignette l image s ouvre dans un nouvel onglet

See merge request !1226

c1362332

Nov 03, 2015
- rel #32179 : backport fix of #31732 into stable · dfcda2b8
  Patrick Barroca authored 9 years ago
  
  dfcda2b8
- hotline #31732 fix popups on record thumbnail click · 5d347519
  Laurent authored 9 years ago and Patrick Barroca committed 9 years ago
  
  5d347519