Commits · 9099a7910dde11625bff33fb0f23a2b37a96dc04 · afi / opacce

Nov 13, 2017
- Merge remote-tracking branch... · 9099a791
  Laurent authored 7 years ago
```
Merge remote-tracking branch 'refs/remotes/origin/hotline#67232_dole_moissonnage_pnb_ne_fonctionne_plus' into origin-dev#65756_s91_afficher_le_media_ou_le_player_omeka_dans_bokeh_base_de_demo_et_projets_a_venir
```
  9099a791
- dev #65756 fix variable name · 783d9efb
  Laurent authored 7 years ago
  
  783d9efb
- hotline #67232 fix syntax error · 7c9f6da8
  Ghislain Loas authored 7 years ago
  
  7c9f6da8
- hotline #67232 fix migration patch · 7b311e7e
  Ghislain Loas authored 7 years ago
  
  7b311e7e
- hotline #67232 fix calls to Class_Album::setEditeur · ee69714f
  Ghislain Loas authored 7 years ago
  
  ee69714f
- hotline #67232 update version file · 2ac49fc0
  Ghislain Loas authored 7 years ago
  
  2ac49fc0
- hotline #67232 fix calls to Album::setEditeur · 2adf2adf
  Ghislain Loas authored 7 years ago
  
  2adf2adf
- hotline #67232 digital resource does not call Album::setEditeur anymore · 4b21be3d
  Ghislain Loas authored 7 years ago
  
  4b21be3d
- hotline #67232 deprecate Album::setEditeur · 08249f9b
  Ghislain Loas authored 7 years ago
  
  08249f9b
Nov 11, 2017
- dev #65756 Omeka : prepare album render and extract iiif manifest uri · 13bb60bb
  Laurent authored 7 years ago
  
  13bb60bb
- dev #65756 Omeka: parse authors · 521ec0b5
  Laurent authored 7 years ago
  
  521ec0b5
- dev #65756 add Omeka Batch · 814263c0
  Laurent authored 7 years ago
  
  814263c0
- dev #65756 add Omeka connector · 6c075b71
  Laurent authored 7 years ago
  
  6c075b71
Nov 07, 2017
- version 7.11.8 · b131759f
  Patrick Barroca authored 7 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	application/modules/admin/views/scripts/profil/proprietes.phtml
#	library/startup.php
```
  7.11.8
  
  b131759f
- version 7.10.10 · 569c5ef3
  Patrick Barroca authored 7 years ago
  
  7.10.10
  
  569c5ef3
- Merge branch 'hotline#66742_la_madeleine_pbm_sur_kiosque_et_affichage_de_resultats' into 'stable' · c2edfdd0
  Patrick Barroca authored 7 years ago
```
Hotline#66742 la madeleine pbm sur kiosque et affichage de resultats

See merge request !2387
```
  c2edfdd0
- hotline #66742 : fix failures · 18097b14
  Patrick Barroca authored 7 years ago
  
  18097b14
- hotline #66742 : fix failures · f292e336
  Patrick Barroca authored 7 years ago
  
  f292e336
- hotline #66742 : fix dragAndDrop form element to use input value · 65c095e7
  Patrick Barroca authored 7 years ago
  
  65c095e7
- hotline #66742 : cannot set empty default page size · eb854c72
  Patrick Barroca authored 7 years ago
  
  eb854c72
- hotline #66742 : cannot set empty search result page size · a41aa067
  Patrick Barroca authored 7 years ago
  
  a41aa067
- hotline #66742 : can view search result config from admin · de3e8529
  Patrick Barroca authored 7 years ago
  
  de3e8529
Oct 25, 2017
- version 7.11.7 · 8800de23
  Ghislain Loas authored 7 years ago
  
  7.11.7
  
  8800de23
- version 7.10.9 · 4c3323d4
  Ghislain Loas authored 7 years ago
  
  7.10.9
  
  4c3323d4
- Merge remote-tracking branch 'refs/remotes/origin/stable' · e5f74908
  Ghislain Loas authored 7 years ago
```
Conflicts:
	VERSIONS
	VERSIONS_HOTLINE/65680
	library/startup.php
```
  e5f74908
- Merge branch 'hotline#65680_arte_univers_cine_suite_du_ticket_65505' into 'stable' · 9bc3571c
  Ghislain Loas authored 7 years ago
```
hotline #65680 fix artevod

See merge request !2383
```
  9bc3571c
- hotline #65680 fix artevod · ea1e2253
  Ghislain Loas authored 7 years ago
  
  ea1e2253
Oct 24, 2017
- version 7.11.6 · 336a2327
  Ghislain Loas authored 7 years ago
  
  7.11.6
  
  336a2327
- version 7.10.8 · 40535d5b
  Ghislain Loas authored 7 years ago
  
  7.10.8
  
  40535d5b
- Merge branch 'hotline-master' into 'master' · 9d34ea3c
  Ghislain Loas authored 7 years ago
```
Hotline master

See merge request afi/opacce!2382
```
  9d34ea3c
- Merge branch 'stable' into 'hotline-master' · e73bff63
  Ghislain Loas authored 7 years ago
```
Stable

See merge request !2381
```
  e73bff63
- Merge branch 'hotline#65246_comptes_utilisateurs_introuvables' into 'stable' · 23ea152c
  Ghislain Loas authored 7 years ago
```
hotline #65246 fix double finder

See merge request !2378
```
  23ea152c
- hotline #65246 refacto singleNanook + fix failures · 877bdc0c
  Ghislain Loas authored 7 years ago
  
  877bdc0c
- Merge branch 'hotline#66007_master_systeme_de_notation_des_avis_ko' into 'hotline-master' · 0ed61071
  Ghislain Loas authored 7 years ago
```
hotline #66007 :replace js rating by compatible js with jquery 3.2

See merge request !2375
```
  0ed61071
- Merge branch 'hotline#65680_arte_univers_cine_suite_du_ticket_65505' into 'stable' · e97193df
  Ghislain Loas authored 7 years ago
```
hotline #65680 upgrade artevod link

See merge request !2376
```
  e97193df
- holtine #65246 fix tests failrues · 1c026cf9
  Ghislain Loas authored 7 years ago
  
  1c026cf9
Oct 23, 2017
- hotline #65246 respawn parent matchers · 65614f00
  Ghislain Loas authored 7 years ago
  
  65614f00
- Merge branch 'dev#61350_entrepot_oai_gallica_europeana' into 'master' · 5c45c90d
  Patrick Barroca authored 7 years ago
```
Dev#61350 entrepot oai gallica europeana

See merge request !2380
```
  5c45c90d
- Merge branch... · ff873d54
  Ghislain Loas authored 7 years ago
```
Merge branch 'dev#66057_bonus_utiliser_la_grande_image_plutot_que_la_vignette_en_affichage_notice' into 'master'

Dev#66057 bonus utiliser la grande image plutot que la vignette en affichage notice

See merge request !2379
```
  ff873d54
- hotline #65246 fix double finder · 68e307a1
  Ghislain Loas authored 7 years ago
  
  68e307a1

Admin message