Commits · 41fd60a480672640ffc71c8015ce9c8339a4dacc · afi / opacce

Oct 17, 2017

Merge remote-tracking branch 'refs/remotes/afi/master' into... · 41fd60a4

Patrick Barroca authored 7 years ago

Merge remote-tracking branch 'refs/remotes/afi/master' into dev#61350_entrepot_oai_gallica_europeana

# Conflicts:
#	application/modules/admin/views/scripts/album/edit-images.phtml
#	library/ZendAfi/View/Helper/TagUploadMultiple.php
#	tests/library/ZendAfi/View/Helper/TagUploadMultipleTest.php

41fd60a4

dev #61350 : version files · 58efbd8b
Patrick Barroca authored 7 years ago

58efbd8b

Oct 16, 2017
- 7.11.5 · 746a79fc
  Laurent authored 7 years ago
  
  7.11.5
  
  746a79fc
- Merge branch 'stable' into hotline-master · e5cafa71
  Laurent authored 7 years ago
```
Conflicts:
	VERSIONS
	library/startup.php
```
  e5cafa71
- 7.10.7 · 96e03eda
  Laurent authored 7 years ago
  
  7.10.7
  
  96e03eda
- Merge branch 'hotline#65553_emprunt_pnb' into 'stable' · e345b6ff
  Laurent authored 7 years ago
```
hotline #65553 : loan PNB fix open window

See merge request !2370
```
  e345b6ff
- Merge branch 'hotline#65557_bizarreries_abonne' into 'stable' · aa26f770
  Laurent authored 7 years ago
```
Hotline#65557 bizarreries abonne

See merge request !2369
```
  aa26f770
- hotline #65553 fix RT comments · 371888d8
  Laurent authored 7 years ago
  
  371888d8
- hotline #65557 fix rt comments · 7e14cfa3
  Ghislain Loas authored 7 years ago
  
  7e14cfa3
- Merge branch 'hotline#64218_notices_assimil_non_indexees' into 'stable' · 52d45677
  Laurent authored 7 years ago
```
holtine #64218 fix digital ressources facette indexation

See merge request !2371
```
  52d45677
- hotline #65553 fix test failure · 4918857f
  Ghislain Loas authored 7 years ago
  
  4918857f
- hotline #65557 fix test failures · 45dedc20
  Ghislain Loas authored 7 years ago
  
  45dedc20
Oct 13, 2017
- hotline #65557 improve physically loannable · 2ccc0351
  Ghislain Loas authored 7 years ago
  
  2ccc0351
Oct 12, 2017
- hotline #65553 : change version file · 095664a7
  efalcy authored 7 years ago
  
  095664a7
- holtine #64218 fix digital ressources facette indexation · 8e9a7b98
  efalcy authored 7 years ago
  
  8e9a7b98
- Update 65557 · 95e0c0d7
  Patrick Barroca authored 7 years ago
  
  95e0c0d7
- hotline #65557 update version · 9d0e205f
  Ghislain Loas authored 7 years ago
  
  9d0e205f
- hotline #65557 add storm limit message · 03a6523a
  Ghislain Loas authored 7 years ago
  
  03a6523a
- hotline #65557 fix loans and holds list · 1f48ebe5
  Ghislain Loas authored 7 years ago
  
  1f48ebe5
Oct 11, 2017
- Merge branch... · 1a71b364
  Patrick Barroca authored 7 years ago
```
Merge branch 'hotline#64360_utilisateur_non_a_jour_dans_bokeh_pb_infos_du_web_service' into 'stable'

hotline #64360 fix single nanook double finder strategy detection

See merge request !2367
```
  1a71b364
- Merge branch 'hotline#64820_connecteur_cite_de_la_musique' into 'stable' · 43f08c22
  Patrick Barroca authored 7 years ago
```
Hotline#64820 connecteur cite de la musique

See merge request !2368
```
  43f08c22
- hotline #65553 : loan PNB fix open window · 8aba50a2
  efalcy authored 7 years ago
  
  8aba50a2
- hotline #64820 fix oai multiple sets harvesting · 47cda8ad
  Ghislain Loas authored 7 years ago
  
  47cda8ad
Oct 10, 2017
- hotline #64820 remove exit · 908578df
  Ghislain Loas authored 7 years ago
  
  908578df
Oct 09, 2017
- hotline #64820 bug found · dd982183
  Ghislain Loas authored 7 years ago
  
  dd982183
- hotline #64360 fix single nanook double finder strategy detection · d0589acc
  Ghislain Loas authored 7 years ago
  
  d0589acc
- article versionning: fix tab highlight · ec1616fb
  Laurent authored 7 years ago
  
  ec1616fb
- dev #61350: fix failures · c556c028
  Patrick Barroca authored 7 years ago
  
  c556c028
- dev #61350: earlierDatestamp, from and until computed on created_at field · a690d310
  Patrick Barroca authored 7 years ago
  
  a690d310
- Translated using Weblate (English) · 077bcd2a
  Weblate Admin authored 7 years ago
```
Currently translated at 99.9% (3502 of 3504 strings)
```
  7.11.4
  
  077bcd2a
- collect strings · b7f9113c
  Laurent authored 7 years ago
  
  b7f9113c
- 7.11.4 · 5de37a6c
  Laurent authored 7 years ago
  
  5de37a6c
- Merge branch 'hotline-master' · fd7beac9
  Laurent authored 7 years ago
  
  fd7beac9
- Merge branch 'stable' into hotline-master · dbf1d004
  Laurent authored 7 years ago
```
Conflicts:
	VERSIONS
	library/startup.php
```
  dbf1d004
- 7.10.6 · 1fefe7fe
  Laurent authored 7 years ago
  
  7.10.6
  
  1fefe7fe
- 7.10.6 · c70fc7d8
  Laurent authored 7 years ago
  
  c70fc7d8
- Merge branch 'origin-refacto_http_client_was_skilleos' · 0a404dfe
  Laurent authored 7 years ago
  
  0a404dfe
- Merge branch 'origin-dev#65027_skilleos' · 7f645d10
  Laurent authored 7 years ago
  
  7f645d10
- dev #65027 add skilleos feature · 7ceb85b0
  Laurent authored 7 years ago
  
  7ceb85b0
- Merge branch 'dev#65510_maj_jquery' into 'master' · 0dbaf344
  Ghislain Loas authored 7 years ago
```
Dev#65510 maj jquery

See merge request !2366
```
  0dbaf344

Admin message